diff options
| author | Ferry Huberts <ferry.huberts@pelagic.nl> | 2009-04-10 21:33:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-11 12:20:17 -0700 |
| commit | 70af4e9bef988a98061237c78cbd0a71d8de48bb (patch) | |
| tree | 0e7f68e3b7dd3a0c89c9b12681d328e3425c565c | |
| parent | 21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105 (diff) | |
| download | git-70af4e9bef988a98061237c78cbd0a71d8de48bb.tar.gz | |
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>
| -rwxr-xr-x | git-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index efa31a228e..2e3e02b3b5 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)" |