From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 22 Sep 2008 07:31:03 GMT
Subject: Re: [PATCH (GIT-GUI)] git-gui: Reenable staging unmerged files by clicking the icon.
Message-ID: <48D749B7.9030305@viscovery.net>
In-Reply-To: <200809201219.18630.angavrilov@gmail.com>

Alexander Gavrilov schrieb:
> 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)

Thanks, works fine after a brief test:

Tested-by: Johannes Sixt <johannes.sixt@telecom.at>

-- Hannes