diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:09:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:09:35 (GMT) |
| commit | 9ce57f12280eb6a95043e28ad68ff2b6c70c09ad (patch) | |
| tree | 5e4a7d25dffc8a7fc193cc7e473103f86ebcae86 /git-am.sh | |
| parent | e82935d9177f93a4777e8a3ee5e9d131fb884613 (diff) | |
| parent | 2b52123fcf840686b69e10807fd0f985ec4167f3 (diff) | |
| download | git-9ce57f12280eb6a95043e28ad68ff2b6c70c09ad.zip git-9ce57f12280eb6a95043e28ad68ff2b6c70c09ad.tar.gz git-9ce57f12280eb6a95043e28ad68ff2b6c70c09ad.tar.bz2 | |
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
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions