Code

git-gui: Support resolving conflicts via the diff context menu.
authorAlexander Gavrilov <angavrilov@gmail.com>
Sat, 30 Aug 2008 20:55:45 +0000 (00:55 +0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 5 Sep 2008 04:28:54 +0000 (21:28 -0700)
commit042c232535c329f168e8a515588f38a4117954fb
tree4c0daf23d73190a2419c6b1732921a31cf09f861
parent700e560341edfe32242b6b5b3b380d6f945ec0e8
git-gui: Support resolving conflicts via the diff context menu.

If the file has merge conflicts, show a special version of the
diff context menu, which includes conflict resolution commands
instead of Stage Hunk/Line. This patch only supports resolving
by discarding all sides except one.

Discarding is the only way to resolve conflicts involving symlinks
and/or deletion, excluding manual editing.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh
lib/mergetool.tcl [new file with mode: 0644]