Le 12/06/2011 20:01, Benjamin Peterson a écrit : > Another method would be to write a extension for Mercurial which is > "smart" about the format of Misc/NEWS and could do the resolution > automatically.
Even easier than an extension: a merge tool, i.e. a script that knows how to parse the file and compare three versions of it. _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
