Try normalizing files to avoid delete/modify conflicts when merging
authorEyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Fri, 2 Jul 2010 19:20:48 +0000 (21:20 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Jul 2010 22:44:34 +0000 (15:44 -0700)
commit331a1838b26c3032bec27b66307a9de9b3b11509
tree655b6072cac0c93993cacf5ed1a579aaed08f026
parentf217f0e86dc7bacc5dc127982eaadca758b558ce
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>
merge-recursive.c
t/t6038-merge-text-auto.sh