[issue16517] address merge conflicts in devguide null-merge instructions

[Chris Jerdonek]

Chris Jerdonek added the comment:

> Is there a bug report for this on the mercurial tracker?

Indeed there is -- by one of our own in fact :)

http://bz.selenic.com/show_bug.cgi?id=2706

----------
nosy: +pitrou

_______________________________________
Python tracker <report at bugs.python.org>
<http://bugs.python.org/issue16517>
_______________________________________