| commit | 9ce57f12280eb6a95043e28ad68ff2b6c70c09ad | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Oct 2014 17:09:35 +0000 (29 10:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Oct 2014 17:09:35 +0000 (29 10:09 -0700) | ||
| tree | 5e4a7d25dffc8a7fc193cc7e473103f86ebcae86 | treesnapshot (tar.gz zip) |
| parent | e82935d9177f93a4777e8a3ee5e9d131fb884613 | commitdiff |
| parent | 2b52123fcf840686b69e10807fd0f985ec4167f3 | commitdiff |
Merge branch 'da/difftool'
Allow diff tool backend to stop early by exiting with a non-zero
status.
* da/difftool:
difftool: add support for --trust-exit-code
difftool--helper: exit when reading a prompt answer fails
Allow diff tool backend to stop early by exiting with a non-zero
status.
* da/difftool:
difftool: add support for --trust-exit-code
difftool--helper: exit when reading a prompt answer fails
| git-difftool.perl | diff1 | diff2 | blobhistory |