git-gui: Reenable staging unmerged files by clicking the icon.
authorAlexander Gavrilov <angavrilov@gmail.com>
Sat, 20 Sep 2008 08:19:18 +0000 (12:19 +0400)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 24 Sep 2008 19:51:43 +0000 (12:51 -0700)
commit3e34838caf796e67c057a136d1fdfe1d4286a003
tree2ee7832031889e8ca002f3d1ca680ac32b835852
parent6fc835a3f36146006bb33362368cf9d314877e51
git-gui: Reenable staging unmerged files by clicking the icon.

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)

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh
lib/diff.tcl
lib/mergetool.tcl