13 Jun
2011
13 Jun
'11
12:02 a.m.
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.