From: David Aguilar Date: Sun, 12 Apr 2009 03:41:55 GMT Subject: [PATCH 1/2] mergetool--lib: Fix misspelled mergetool.keepBackup Message-ID: <1239507716-6766-1-git-send-email-davvid@gmail.com> From: Ferry Huberts In several places mergetool.keepBackup was misspelled as merge.keepBackup. Signed-off-by: Ferry Huberts --- This is Ferry's patch with Junio's suggested commit message. Based on pu. git-mergetool.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index efa31a2..2e3e02b 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)" -- 1.6.2.2.471.g6da14