Ezio Melotti added the comment: + hg resolve -am # needed only if the merge created conflicts
IIUC it's necessary, but only if you had a conflict and hg didn't invoke a 3-way merge tool. Here I use kdiff3, and I rarely have to use hg resolve. ---------- _______________________________________ 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
