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>
Ferry Huberts committed
Apr 10, 2009 at 21:33 UTC
70af4e9bef988a98061237c78cbd0a71d8de48bb
1 file changed
+1
-1
git-mergetool.sh
+1
-1
@@ -257,7 +257,7 @@ prompt_after_failed_merge() {
257
merge_tool=$(get_merge_tool "$merge_tool") || exit
258
merge_tool_cmd="$(get_merge_tool_cmd "$merge_tool")"
259
merge_tool_path="$(get_merge_tool_path "$merge_tool")" || exit
260
-merge_keep_backup="$(git config --bool merge.keepBackup || echo true)"
260
+merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
261
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
262
merge_tool_trust_exit_code="$(git config --bool mergetool."$merge_tool".trustExitCode || echo false)"
263