mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-01 10:41:25 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
833 Commits 6 Branches 954 Tags 472 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
48c74a58b1
Go to file
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: Honor a config.mak in git-gui's top level 2007-10-13 22:14:14 -04:00
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