diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:08 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:05 -0700 |
| commit | 84a08a47b9559e76df96645c536845f31ba4dc7b (patch) | |
| tree | a8e060859a43ef7dd6d600a96101138d7a6224f2 /t/t6020-merge-df.sh | |
| parent | 4ab9a157d06956ce5a1060a28404cbade3039fa2 (diff) | |
| download | git-84a08a47b9559e76df96645c536845f31ba4dc7b.tar.gz git-84a08a47b9559e76df96645c536845f31ba4dc7b.tar.xz | |
handle_delete_modify(): Check whether D/F conflicts are still present
If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6020-merge-df.sh')
| -rwxr-xr-x | t/t6020-merge-df.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index bc9db1a0f..7b1ce8270 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -71,7 +71,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' ' git commit -m deleted ' -test_expect_failure 'modify/delete + directory/file conflict' ' +test_expect_success 'modify/delete + directory/file conflict' ' git checkout delete^0 && test_must_fail git merge modify && |