From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 24 Sep 2008 19:53:01 GMT
Subject: Re: [PATCH (GIT-GUI)] git-gui: Reenable staging unmerged files by clicking the icon.
Message-ID: <20080924195301.GA29793@spearce.org>
In-Reply-To: <20080924182508.GC3669@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> wrote:
> Alexander Gavrilov <angavrilov@gmail.com> wrote:
> > This restores functionality of the file icon for unmerged files.
> > Safety is enforced by loading the diff and checking for lines
> > that look like conflict markers. If such lines are found, or
> > the conflict involves deletion and/or symlinks, a confirmation
> > dialog is presented. Otherwise, the icon immediately stages the
> > working copy version of the file.
> > 
> > Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca
> > (Restore ability to Stage Working Copy for conflicts)
> 
> Can I get a resend of this patch?

Never mind.  Its applied now.  I broke down after lunch and found
the one hunk that was an issue, and trivially hand merged it.
 
-- 
Shawn.