diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-12 14:31:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-12 14:31:39 -0800 |
| commit | 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 (patch) | |
| tree | bec8ec6f7d910bce51a681bb81a601709d95c54a /git-difftool--helper.sh | |
| parent | Merge branch 'jk/colors-fix' (diff) | |
| parent | mergetools: stop setting $status in merge_cmd() (diff) | |
| download | tgif-0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8.tar.xz | |
Merge branch 'da/difftool-mergetool-simplify-reporting-status'
Code simplification.
* da/difftool-mergetool-simplify-reporting-status:
mergetools: stop setting $status in merge_cmd()
mergetool: simplify conditionals
difftool--helper: add explicit exit statement
mergetool--lib: remove use of $status global
mergetool--lib: remove no-op assignment to $status from setup_user_tool
Diffstat (limited to 'git-difftool--helper.sh')
| -rwxr-xr-x | git-difftool--helper.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index d4fb6dfe13..2b11b1d6fe 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -94,3 +94,5 @@ else shift 7 done fi + +exit 0 |