diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2014-11-18 10:16:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-18 10:16:55 -0800 |
| commit | 3f78278beb9792368de7edbbb031c3a88e0038a1 (patch) | |
| tree | 42d7a2d7309fffd683ddd62b507ae1d65bea1a64 /git-mergetool--lib.sh | |
| parent | Merge branch 'master' of git://github.com/git-l10n/git-po (diff) | |
| parent | difftool: honor --trust-exit-code for builtin tools (diff) | |
| download | git-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.xz git-3f78278beb9792368de7edbbb031c3a88e0038a1.zip | |
Merge branch 'da/difftool'
Fix-up to a new feature in 'master'.
* da/difftool:
difftool: honor --trust-exit-code for builtin tools
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index a40d3dfea67..2b6635130a6 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -221,6 +221,7 @@ run_merge_tool () { else run_diff_cmd "$1" fi + status=$? return $status } |