Merge branch 'tz/notes-error-to-stderr'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:34 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:34 +0000 (11:06 +0900)
commitc5e763083fa675629c7d936d72fb67d8f03e0846
treee1e4bf68f99850e8bf10ee5fccbbf20bb341a68b
parentdec01eee45f4275f1b9115947452cbd0964a661a
parent89b9e31dd56705af01da2a1a3dc2d466172cb016
Merge branch 'tz/notes-error-to-stderr'

"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
builtin/notes.c