From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 5 Aug 2010 11:15:32 +0000 (-0500)
Subject: merge-trees: let caller decide whether to renormalize
X-Git-Tag: v1.7.3-rc0~17^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4?ds=inline;hp=1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4

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>
---