| commit | 48c74a58b129e7230d74b2fba5c2d29eaa1f11dc | [log] [tgz] |
|---|---|---|
| author | Alexander Gavrilov <angavrilov@gmail.com> | Sun Aug 31 00:59:47 2008 +0400 |
| committer | Shawn O. Pearce <spearce@spearce.org> | Thu Sep 04 21:28:55 2008 -0700 |
| tree | 2ce306d8612f2525dd215f0f8d0f7e0c78b01210 | |
| parent | 617ceee653bd7377f662bfc6d3085f321efab7e4 [diff] |
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>