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.
% unbundle
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
d/b
% move and copy
a
d/b
% bundle
2 changesets found
pulling from ../symlinks.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 6 changes to 6 files
(run 'hg update' to get a working copy)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
d/b