summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-17 17:25:55 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-17 17:25:55 -0700
commit253348b2dbb6519c82e6bc3543c652b9727771ed (patch)
tree27b77cb1cf424396f9c609ad062766411fe6adeb /combine-diff.c
parentddd89c6f86210f18ce19198d163e05dfd311c5ce (diff)
parentfc1b56f054a79400c4e72cb1aab97ba2605cbd83 (diff)
downloadgit-253348b2dbb6519c82e6bc3543c652b9727771ed.tar.gz
Merge branch 'cb/maint-exec-error-report'
* cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions