| commit | 48c74a58b129e7230d74b2fba5c2d29eaa1f11dc | |
| author | Alexander Gavrilov <angavrilov@gmail.com> | |
| Sat, 30 Aug 2008 20:59:47 +0000 (31 00:59 +0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 5 Sep 2008 04:28:55 +0000 (4 21:28 -0700) | ||
| tree | 2ce306d8612f2525dd215f0f8d0f7e0c78b01210 | treesnapshot (tar.gz zip) |
| parent | 617ceee653bd7377f662bfc6d3085f321efab7e4 | commitdiff |
git-gui: Support more merge tools.
Add native support for Araxis Merge, WinMerge and Perforce merge.
Custom merge tools are not implemented by mergetool.tcl; besides,
native support allows constructing the command lines in a more
intelligent way.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Add native support for Araxis Merge, WinMerge and Perforce merge.
Custom merge tools are not implemented by mergetool.tcl; besides,
native support allows constructing the command lines in a more
intelligent way.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/mergetool.tcl | diffblobblamehistory |