diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 12:29:03 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 04:37:04 +0400 |
| commit | 882fd11aff6f0e8add77e75924678cce875a0eaf (patch) | |
| tree | afdfb547ff6ad755596808098986c20a31755a37 /t/t6022-merge-rename.sh | |
| parent | 3b130adf9c8b0b37acb0959b84a3222bc22ebcff (diff) | |
merge-recursive: Delay content merging for renames
Move the handling of content merging for renames from process_renames() to
process_df_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
| -rwxr-xr-x | t/t6022-merge-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 1f29c0a94d..edbfa477c1 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -455,7 +455,7 @@ cat >expected <<\EOF && >>>>>>> dir-not-in-way EOF -test_expect_failure 'Rename+D/F conflict; renamed file cannot merge, dir not in way' ' +test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in way' ' git reset --hard && rm -rf dir~* && git checkout -q renamed-file-has-conflicts^0 && |