From: Paul Mackerras <paulus@samba.org>
Date: Fri, 07 Nov 2008 11:51:43 GMT
Subject: Re: [PATCH (GITK) v3 4/6] gitk: Make cherry-pick call git-citool on conflicts.
Message-ID: <18708.11215.667112.83201@cargo.ozlabs.ibm.com>
In-Reply-To: <1225652389-22082-5-git-send-email-angavrilov@gmail.com>

Alexander Gavrilov writes:

> Now that git-gui has facilities to help users resolve
> conflicts, it makes sense to launch it from other GUI
> tools when they happen.

The resolution capabilities of git citool seem to be that it detects
the conflict markers and lets you run meld on the 3 versions.  Have I
missed anything there?  Do people find that fixing things manually in
meld is sufficient, or do we really want something more powerful?

Paul.