Mercurial > hg
graph
-
filemerge: add internal:tagmerge merge toolThu, 26 Jun 2014 01:20:25 +0200, by Angel Ezquerra
-
filemerge: use non-minimal conflict marker regions (BC)Fri, 18 Jul 2014 21:49:52 -0500, by Matt Mackall
-
test: use more elaborated content in ``test-conflict.t``Mon, 09 Jun 2014 03:49:07 -0700, by Pierre-Yves David