R. David Murray added the comment: Yes, so I suppose you could add a footnote that says "using a three way merge tool generally makes this step unnecessary".
Is there a bug report for this on the mercurial tracker? If so we could link to the bug report :) ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue16517> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
