Subject: Re: [PATCH (GIT-GUI FIX)] git-gui: Restore ability to Stage Working Copy for conflicts.

From: Johannes Sixt <[email-masked]>
Date: Tue, 09 Sep 2008 08:18:40 +0200

Alexander Gavrilov schrieb:
> Tools like rerere leave files marked as conflicts in the index,
> while actually resolving them in the working copy. Also, some
> people like to use an external editor to resolve conflicts.
> 
> This patch restores functionality previously removed in
> commit 617ceee653 by adding a new context menu item.
> It still ensures that the user does not stage conflicting files
> accidentally by clicking on the icon instead of the name.

Thanks! Works well here.

Tested-by: Johannes Sixt <[email-masked]>

-- Hannes