From: Jeff King <peff@peff.net>
Date: Sat, 15 Nov 2008 05:38:41 GMT
Subject: Re: [PATCH 3/3] Add -k/--keep-going option to mergetool
Message-ID: <20081115053841.GA20763@coredump.intra.peff.net>
In-Reply-To: <7vy6zl7drn.fsf@gitster.siamese.dyndns.org>

On Fri, Nov 14, 2008 at 09:35:08PM -0800, Junio C Hamano wrote:

> > -'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]...
> 
> I wonder why this even needs to be an option.  If you do not want to
> resolve all of them, you can limit the amount of work you would do by
> giving list of paths to work on, can't you?

I don't know about Charles, but I often don't know that I don't want to
merge a file using the graphical tool until I see it in the graphical
tool. IOW, I start trying to merge it there and realize the conflict is
such that I am better off doing it in my editor with conflict markers.

-Peff