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)
commit042c232...35c329f168e8a515588f38a4117954fb
tree4c0daf2...d73190a2419c6b1732921a31cf09f861copy hash to clipboard (tree)
parent700e560...41edfe32242b6b5b3b380d6f945ec0e8copy hash to clipboard (diff)
git-gui.sh
lib/mergetool.tcl [new file with mode: 0644]