From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:09:04 +0000 (-0800)
Subject: Merge branch 'tz/notes-error-to-stderr' into maint
X-Git-Tag: v2.15.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0cfcb1695f461db0330934f951160c9824d4de8f

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
---

0cfcb1695f461db0330934f951160c9824d4de8f