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

1  2 
builtin/notes.c
diff --cc builtin/notes.c
Simple merge