diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:20:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:20:06 -0700 |
| commit | 36bad9dee0a729f6205ceba3b059139162e01ab5 (patch) | |
| tree | 6b019ea52c2a490d9ff58e1e0506892aeb3ffc83 /git-merge-resolve.sh | |
| parent | Merge branch 'cb/maint-quiet-push' into maint (diff) | |
| parent | notice error exit from pager (diff) | |
| download | tgif-36bad9dee0a729f6205ceba3b059139162e01ab5.tar.xz | |
Merge branch 'cb/maint-exec-error-report' into maint
* cb/maint-exec-error-report:
notice error exit from pager
error_routine: use parent's stderr if exec fails
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions