projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8052e78) | patch
git-gui: Ensure consistent usage of mergetool.keepBackup
authorFerry Huberts <ferry.huberts@pelagic.nl>
Tue, 7 Apr 2009 15:33:35 +0000 (17:33 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 8 Apr 2009 14:40:58 +0000 (07:40 -0700)
commitfb25092a88ba889f540beaf9acdb208421ce2a20
treea96c6607704f2d74840ccebb6d6c47e7b715d579tree | snapshot
parent8052e788b5e9ae2e2d06b5050fa73394ffe0993acommit | diff
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>
git-gui.sh diff | blob | history
lib/mergetool.tcl diff | blob | history
Git—the stupid content tracker