Alexander Gavrilov 48c74a58b1 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>

2008-09-04 21:28:55 -07:00

lib

git-gui: Support more merge tools.

2008-09-04 21:28:55 -07:00

macosx

git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk

2008-07-25 15:08:33 -07:00

po

git-gui: Fix string escaping in po2msg.sh

2008-09-01 15:39:11 -07:00

windows

git-gui (Windows): Change wrapper to execdir 'libexec/git-core'

2008-07-29 22:43:37 -07:00

.gitignore

…

git-gui.sh

git-gui: Don't allow staging files with conflicts.

2008-09-04 21:28:55 -07:00

GIT-VERSION-GEN

git-gui 0.11

2008-08-10 00:02:08 -07:00

Makefile

git-gui (Windows): Switch to relative discovery of oguilib

2008-07-29 22:43:37 -07:00

Description

No description provided

595 MiB

Languages

C 50.5%

Shell 38.8%

Perl 4.4%

Tcl 3.2%

Python 0.8%

Other 2.1%