diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-08-31 00:59:47 +0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:28:55 -0700 |
| commit | 48c74a58b129e7230d74b2fba5c2d29eaa1f11dc (patch) | |
| tree | 2ce306d8612f2525dd215f0f8d0f7e0c78b01210 /lib/diff.tcl | |
| parent | git-gui: Don't allow staging files with conflicts. (diff) | |
| download | tgif-48c74a58b129e7230d74b2fba5c2d29eaa1f11dc.tar.xz | |
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>
Diffstat (limited to 'lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions