From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Fri, 10 Apr 2009 19:33:57 +0000 (+0200)
Subject: Fix misspelled mergetool.keepBackup
X-Git-Tag: v1.6.3-rc1~13^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=70af4e9bef988a98061237c78cbd0a71d8de48bb;p=git.git

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>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index efa31a228..2e3e02b3b 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -257,7 +257,7 @@ prompt_after_failed_merge() {
 merge_tool=$(get_merge_tool "$merge_tool") || exit
 merge_tool_cmd="$(get_merge_tool_cmd "$merge_tool")"
 merge_tool_path="$(get_merge_tool_path "$merge_tool")" || exit
-merge_keep_backup="$(git config --bool merge.keepBackup || echo true)"
+merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
 merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
 merge_tool_trust_exit_code="$(git config --bool mergetool."$merge_tool".trustExitCode || echo false)"