diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-29 19:08:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-29 19:08:51 -0700 |
commit | 144dfc5c63dfe829aafdb2cba3bd549600b6008b (patch) | |
tree | 0f8f64b28722ff123c942552ec59265f330a9c0f /Documentation/git-mergetool.txt | |
parent | Git 1.7.5.3 (diff) | |
parent | run-command: handle short writes and EINTR in die_child (diff) | |
download | tgif-144dfc5c63dfe829aafdb2cba3bd549600b6008b.tar.xz |
Merge branch 'jn/run-command-error-failure' into maint
* 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 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions