[issue18967] Find a less conflict prone approach to Misc/NEWS

[Terry J. Reedy]

Terry J. Reedy added the comment:

Thanks for the reminder/suggestion.  Re-reading Ezio's two patches (newsmerge.py and .hg/hgrc additions in msg217079), they appear to jointly automate what I now do by hand (revert to local and dump merge artifacts, replace with edited file with new entries pasted in, and mark as resolved) .  I also checked that the current Windows installers make .py files executable, so hg should be able to run newsmerge on Windows.  I have downloaded the file and made the additions to my 3.5 hgrc to test next time I have a news entry.

----------

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