Junio C Hamano wrote:
The message goes to the standard output stream since it was introduced in 809f38c8 ("git notes merge: Manual conflict resolution, part 1/2", 2010-11-09) and 6abb3655 ("git notes merge: Manual conflict resolution, part 2/2", 2010-11-09). I do think it makes more sense to send it to the standard error stream, but just in case if the original author thinks of a reason why it shouldn't, let's summon Johan and ask his input.
Sounds like a good plan. If the message does move to stderr, there are also a few tests in 3310 that need adjusted. They presume an error message from `git notes merge`, but they only redirect stdout to the output file.
While I was bored, I prepared a commit with these changes and confirmed the test suite passes, in case we get an ACK from Johan.
-- Todd ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ It is impossible to enjoy idling thoroughly unless one has plenty of work to do. -- Jerome K. Jerome
