Code

merge-trees: let caller decide whether to renormalize
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 5 Aug 2010 11:15:32 +0000 (06:15 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Aug 2010 16:20:00 +0000 (09:20 -0700)
commit1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4
treee342fb1ebe7e0d14874ae0b02033640dfa23793d
parent3e7589b7b3ff7a7aa93bec39c40603e370c51317
merge-trees: let caller decide whether to renormalize

Add a "renormalize" option to struct merge_options so callers can
decide on a case-by-case basis whether the merge is likely to have
overlapped with a change in smudge/clean rules.  The option defaults
to the global merge_renormalize setting for now.

No change in behavior intended.

Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
merge-recursive.h