diff options
| author | Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | 2010-07-02 21:20:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-02 15:44:34 -0700 |
| commit | 331a1838b26c3032bec27b66307a9de9b3b11509 (patch) | |
| tree | 655b6072cac0c93993cacf5ed1a579aaed08f026 /t/t6038-merge-text-auto.sh | |
| parent | f217f0e86dc7bacc5dc127982eaadca758b558ce (diff) | |
| download | git-331a1838b26c3032bec27b66307a9de9b3b11509.tar.gz | |
Try normalizing files to avoid delete/modify conflicts when merging
If a file is modified due to normalization on one branch, and deleted on
another, a merge of the two branches will result in a delete/modify
conflict for that file even if it is otherwise unchanged.
Try to avoid the conflict by normalizing and comparing the "base" file
and the modified file when their sha1s differ. If they compare equal,
the file is considered unmodified and is deleted.
Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6038-merge-text-auto.sh')
| -rwxr-xr-x | t/t6038-merge-text-auto.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh index 127baf8560..d1ab86ebd7 100755 --- a/t/t6038-merge-text-auto.sh +++ b/t/t6038-merge-text-auto.sh @@ -51,7 +51,7 @@ test_expect_success 'Check merging addition of text=auto' ' test_cmp file file.temp ' -test_expect_failure 'Test delete/normalize conflict' ' +test_expect_success 'Test delete/normalize conflict' ' git checkout side && git reset --hard initial && git rm file && |