Code

Fix misspelled mergetool.keepBackup
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 10 Apr 2009 19:33:57 +0000 (21:33 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 11 Apr 2009 19:20:17 +0000 (12:20 -0700)
commit70af4e9bef988a98061237c78cbd0a71d8de48bb
tree0e7f68e3b7dd3a0c89c9b12681d328e3425c565c
parent21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105
Fix misspelled mergetool.keepBackup

In several places mergetool.keepBackup was misspelled as merge.keepBackup.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh