git-gui: Restore ability to Stage Working Copy for conflicts.
authorAlexander Gavrilov <angavrilov@gmail.com>
Mon, 8 Sep 2008 16:37:11 +0000 (20:37 +0400)
committerShawn O. Pearce <sop@google.com>
Fri, 12 Sep 2008 15:09:09 +0000 (08:09 -0700)
commit2fe5b2ee42897a3acc78e5ddaace3775eb2713ca
tree7471cf4b45e2e6d1b017ce0cec28a57a224337ee
parenta9786bb42ff4fa4b8031ab69215a66cf329d8324
git-gui: Restore ability to Stage Working Copy for conflicts.

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.

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