➜

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 r.david.murray
Recipients chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, r.david.murray
Date 2012-11-21.12:23:27
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1353500608.28.0.92797160857.issue16517@psf.upfronthosting.co.za>
In-reply-to
Content 
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 :)
History
Date User Action Args
2012-11-21 12:23:28r.david.murraysetrecipients: + r.david.murray, ncoghlan, ezio.melotti, eric.araujo, chris.jerdonek
2012-11-21 12:23:28r.david.murraysetmessageid: <1353500608.28.0.92797160857.issue16517@psf.upfronthosting.co.za>
2012-11-21 12:23:28r.david.murraylinkissue16517 messages
2012-11-21 12:23:27r.david.murraycreate