➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author ezio.melotti
Recipients chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, r.david.murray
Date 2012-11-21.11:35:38
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1353497739.16.0.19025037519.issue16517@psf.upfronthosting.co.za>
In-reply-to
Content 
+      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.
History
Date User Action Args
2012-11-21 11:35:39ezio.melottisetrecipients: + ezio.melotti, ncoghlan, eric.araujo, r.david.murray, chris.jerdonek
2012-11-21 11:35:39ezio.melottisetmessageid: <1353497739.16.0.19025037519.issue16517@psf.upfronthosting.co.za>
2012-11-21 11:35:39ezio.melottilinkissue16517 messages
2012-11-21 11:35:38ezio.melotticreate