On Wed, Apr 15, 2015 at 7:22 PM, Jeff King [off-list ref] wrote:

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.

Yeah, I agree. Nobody should be reading the output to find CONFLICT
anyway (isn't "ls-files -u" for these scripts?), but the current error/info
levels do look inconsistent.