summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:16:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:16:33 -0800
commita4d7615453eff93838d496db6b533b327c8cadfc (patch)
tree397bc90b0b6b648161640cda81c0d83603ab2037 /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'tr/maint-bundle-long-subject' into maint (diff)
parentdisconnect from remote helpers more gently (diff)
downloadtgif-a4d7615453eff93838d496db6b533b327c8cadfc.tar.xz
Merge branch 'sp/smart-http-failure-to-push' into maint
* sp/smart-http-failure-to-push: : Mask SIGPIPE on the command channel going to a transport helper disconnect from remote helpers more gently Conflicts: transport-helper.c
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions