merge-recursive: Avoid unnecessary file rewrites
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:27 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:40 +0000 (14:19 -0700)
commit35a74abff32c32c455a74974130ad2af7d81dfd9
tree2e48ff97b04f0170aaf6a08240fff9628b39ef60
parent3e333a6146ce6565de357e48e439bb94c622d3fe
merge-recursive: Avoid unnecessary file rewrites

Often times, a potential conflict at a path is resolved by merge-recursive
by using the content that was already present at that location.  In such
cases, we do not want to overwrite the content that is already present, as
that could trigger unnecessary recompilations.  One of the patches earlier
in this series ("merge-recursive: When we detect we can skip an update,
actually skip it") fixed the cases that involved content merges, but there
were a few other cases as well.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6022-merge-rename.sh