merge: make 'diverging renames' diagnostic a more helpful note.
See the Hg Book on why we actually want to detect this case:
http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290
Before:
$ hg up
deadbeef
warning: detected divergent renames of X to:
...
After:
$ hg up
deadbeef
note: possible conflict - X was renamed multiple times to:
...
No functionality change.
#!/usr/bin/env python
from hgext import color
# ensure errors aren't buffered
testui = color.colorui()
testui.pushbuffer()
testui.write('buffered\n')
testui.warn('warning\n')
testui.write_err('error\n')
print repr(testui.popbuffer())