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

Apologies, it broke again.

The command I ran to submit the patch was:

   git format-patch -M git-gui-patch~2.. --stdout | git imap-send

I did with git 1.6.6.1, running on cygwin however this process appears
to be corrupting the patch.

Can anyone let me know what I have done wrong?

jon.

On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour <jon.seymour@gmail.com> wrote:
> 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.
>