diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:15:32 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:00 -0700 |
| commit | 1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4 (patch) | |
| tree | e342fb1ebe7e0d14874ae0b02033640dfa23793d /t/t4040-whitespace-status.sh | |
| parent | merge-trees: push choice to renormalize away from low level (diff) | |
| download | tgif-1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4.tar.xz | |
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>
Diffstat (limited to 't/t4040-whitespace-status.sh')
0 files changed, 0 insertions, 0 deletions