[side note: please trim your quoted material when doing inline quoting]

On Thu, Apr 16, 2015 at 12:05:57PM +1000, Bryan Turner wrote:

quoted

      merge: pass verbosity flag down to merge-recursive

I'm pretty confident this change is working as intended, but the
intended change is causing a regression in behavior for me. I'll
readily admit that my workflow is probably wrong, but I thought
perhaps it would be worth surfacing.

[...]
If the goal of passing the verbosity flag down was to fix git merge
--quiet, should the "Automatic merge failed" line also be omitted? But
if that line should _stay_, wouldn't it be better for the "CONFLICT"
lines to also stay?

Yeah, I feared there might be fallouts like this. We are somewhat
blindly passing down the "--quiet" flag without doing a careful audit of
the severity levels in merge-recursive. Potentially we would want a few
levels of verbosity:

  -2: totally silent (-q -q)
  -1: silence chat, mention important errors like CONFLICT markers (-q)
   0: current defaults
   1: more verbosity (-v, what is currently level "3", I guess?)
  >1: and so on with more "-v"; I don't even know what levels are used

That's off the top of my head. I think it really needs somebody to look
through and categorize all of the messages generated by merge-recursive.
In the meantime, unless somebody is planning to jump on this topic
immediately (I am not), I think we can revert 2bf15a3330a from master.
It's definitely fixing _a_ problem, but it's one we've lived with for
many years already.

-Peff