diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:09 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:37 -0700 |
| commit | 3c217c077a86d9ae06ed26bb0baa4475d0e28a0e (patch) | |
| tree | 9af76e87c3b3b100fdbf3aa96bda3808b2eb1c5c /t/t6042-merge-rename-corner-cases.sh | |
| parent | 4f66dade81c2ebc6e1143b6c116960bfcd837067 (diff) | |
| download | git-3c217c077a86d9ae06ed26bb0baa4475d0e28a0e.tar.gz | |
merge-recursive: Provide more info in conflict markers with file renames
Whenever there are merge conflicts in file contents, we would mark the
different sides of the conflict with the two branches being merged.
However, when there is a rename involved as well, the branchname is not
sufficient to specify where the conflicting content came from. In such
cases, mark the two sides of the conflict with branchname:filename rather
than just branchname.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6042-merge-rename-corner-cases.sh')
| -rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 968055d47c..bfc3179332 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -258,7 +258,7 @@ test_expect_success 'rename/directory conflict + clean content merge' ' test -f newfile~HEAD ' -test_expect_failure 'rename/directory conflict + content merge conflict' ' +test_expect_success 'rename/directory conflict + content merge conflict' ' git reset --hard && git reset --hard && git clean -fdqx && |