1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 00:37:55 +01:00
Find a file
Ferry Huberts fb25092a88 git-gui: Ensure consistent usage of mergetool.keepBackup
In several places merge.keepBackup is used i.s.o.
mergetool.keepBackup. This patch makes it all
consistent.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-04-08 07:40:58 -07:00
lib git-gui: Ensure consistent usage of mergetool.keepBackup 2009-04-08 07:40:58 -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: Update Hungarian translation for 0.12 2008-12-10 11:44:03 -08:00
windows git-gui (Windows): Change wrapper to execdir 'libexec/git-core' 2008-07-29 22:43:37 -07:00
.gitattributes git-gui: Use gitattribute "encoding" for file content display 2008-09-24 12:48:31 -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--askpass git-gui: Add a simple implementation of SSH_ASKPASS. 2008-11-01 16:01:34 -07:00
git-gui.sh git-gui: Ensure consistent usage of mergetool.keepBackup 2009-04-08 07:40:58 -07:00
GIT-VERSION-GEN git-gui 0.12 2008-12-17 20:15:17 -08:00
Makefile git-gui: Add a simple implementation of SSH_ASKPASS. 2008-11-01 16:01:34 -07:00