From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 04 Aug 2010 18:12:05 GMT
Subject: Re: [PATCH 3/6] ll-merge: let caller decide whether to renormalize
Message-ID: <7vvd7qfdsa.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100804032144.GD19699@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> Add a "renormalize" parameter to ll_merge 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.  This reveals a few commands that have
> not been taking that situation into account, though it does not fix
> them.
>
> No change in behavior intended.

Looking nice so far; I however think a separate "renormalize" parameter
should be folded into "flag" word, perhaps with a few new macros to make
it easier to access renormalize, virtual-ancestor, and favor-side parts
it.