summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-12-06 09:09:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-12-06 09:09:04 -0800
commit0cfcb1695f461db0330934f951160c9824d4de8f (patch)
treefcf3f5426ba74ac98939229266fee5dfb3dfad35 /t/t7606-merge-custom.sh
parentMerge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint (diff)
parentnotes: send "Automatic notes merge failed" messages to stderr (diff)
downloadtgif-0cfcb1695f461db0330934f951160c9824d4de8f.tar.xz
Merge branch 'tz/notes-error-to-stderr' into maint
"git notes" sent its error message to its standard output stream, which was corrected. * tz/notes-error-to-stderr: notes: send "Automatic notes merge failed" messages to stderr
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions