From: Jeff King <peff@peff.net>
Date: Tue, 21 Oct 2008 11:12:02 GMT
Subject: Re: [PATCH 3/3] Add -k/--keep-going option to mergetool
Message-ID: <20081021111201.GA17363@coredump.intra.peff.net>
In-Reply-To: <1224583999-26279-3-git-send-email-charles@hashpling.org>

On Tue, Oct 21, 2008 at 11:13:19AM +0100, Charles Bailey wrote:

> This option stops git mergetool from aborting at the first failed merge.
> This allows some additional use patterns. Merge conflicts can now be
> previewed one at time and merges can also be skipped so that they can be
> performed in a later pass.

All 3 patches look good to me, and match what I expected from our
earlier discussion. But I am not too familiar with mergetool, so take my
approval with a grain of salt. :)

-Peff