setup.c
40.9 KB
-
merge test: test an actual failure, not conflict · 42f98a26Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.
Edward Thomson committed