From: Jon Seymour <jon.seymour@gmail.com>
Date: Mon, 29 Mar 2010 23:00:49 GMT
Subject: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
Message-ID: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com>

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.

jon.