diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2011-08-05 23:31:29 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-05 15:04:48 -0700 |
| commit | 285c6cbf3c8eeadb6d4d4c3203888809e1cc7a81 (patch) | |
| tree | f240f3d7fc65bbf14ccd3f57c963d8047f01036d /git-mergetool--lib.sh | |
| parent | 5d2fc9135a35284176e99708b9b6f32c9e6eb7a2 (diff) | |
| download | git-285c6cbf3c8eeadb6d4d4c3203888809e1cc7a81.tar.gz | |
misc-sh: fix up whitespace in some other .sh files.
I found that the patched 4 files were different when this
filter is applied.
expand -i | unexpand --first-only
This patch contains the corrected files.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 91f90acfba..9a89e8f319 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -79,7 +79,7 @@ get_merge_tool_cmd () { fi if diff_mode; then echo "$(git config difftool.$merge_tool.cmd || - git config mergetool.$merge_tool.cmd)" + git config mergetool.$merge_tool.cmd)" else echo "$(git config mergetool.$merge_tool.cmd)" fi @@ -419,7 +419,7 @@ get_merge_tool_path () { fi if diff_mode; then merge_tool_path=$(git config difftool."$merge_tool".path || - git config mergetool."$merge_tool".path) + git config mergetool."$merge_tool".path) else merge_tool_path=$(git config mergetool."$merge_tool".path) fi @@ -429,7 +429,7 @@ get_merge_tool_path () { if test -z "$(get_merge_tool_cmd "$merge_tool")" && ! type "$merge_tool_path" > /dev/null 2>&1; then echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\ - "'$merge_tool_path'" + "'$merge_tool_path'" exit 1 fi echo "$merge_tool_path" |