Mercurial > hg
graph
-
filemerge: add 'union' merge to internal merge toolSun, 16 Aug 2015 10:19:00 +0200, by Erik Huelsmann
-
filemerge: split internal merge into api entry point and internal helperSun, 16 Aug 2015 00:24:29 +0200, by Erik Huelsmann
-
simplemerge: add 'mode' kwarg which - when 'union' - suppresses markersSun, 16 Aug 2015 00:00:34 +0200, by Erik Huelsmann