From: Ferry Huberts Date: Fri, 10 Apr 2009 19:33:57 GMT Subject: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git Message-ID: <9a358c8b6275a7103eb036a2d1d6073bcf191e09.1239376248.git.ferry.huberts@pelagic.nl> In-Reply-To: In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent for git Signed-off-by: Ferry Huberts --- 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.0.6