diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:01:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:01:04 -0700 |
| commit | 3970fc5512ac52e798579cf734957a2fac852cfd (patch) | |
| tree | a90d3cf7863dde8ea13a558a4edd0ff27aaa0577 /git-merge-resolve.sh | |
| parent | Merge branch 'js/info-man-path' (diff) | |
| parent | run-command: handle short writes and EINTR in die_child (diff) | |
| download | tgif-3970fc5512ac52e798579cf734957a2fac852cfd.tar.xz | |
Merge branch 'jn/run-command-error-failure'
* jn/run-command-error-failure:
run-command: handle short writes and EINTR in die_child
tests: check error message from run_command
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions