[PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

From: Jon Seymour <jon.seymour@gmail.com>
Date: Mar 30, 2010, 07:00 UTC
Message-ID: <2cfc40321003300000k2b106d31iea2cec001c8f27f@mail.gmail.com>
In-Reply-To: <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com>

And to the list...

On Tue, Mar 30, 2010 at 5:44 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:

Show 20 quoted lines

> Am 3/30/2010 1:00, schrieb Jon Seymour:
>> Resending because my original patch series wasn't whitespace clean and
>> I have now removed the configuration to make the safe behaviour
>> optional - it is not safe by default.
>>
>> If there is any other reason why this patch should not be considered,
>> please let me know.
>>
>> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
>> encapsulate its derivation.
>> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
>> the case of conflicts.
>
> The default mode of diff in the case of conflicts is "condensed combined",
> which removes "unintersting" changes from the display. AFAIK, there also
> exists a mode that is only "combined". I would think that this mode is
> much more useful here because it shows the diff to both HEAD and
> MERGE_HEADs at the same time.
>
> Only that I don't know how to invoke this mode...

You mean in a similar way to the way that gitk displays the diff when you select a merge commit?

jon.