Mercurial > hg
graph
-
commiteditor: refactor default extramsgFri, 18 Jul 2014 23:15:28 -0500, by Matt Mackall
-
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
-
run-tests: make --view work againFri, 18 Jul 2014 17:52:18 -0500, by Matt Mackall
-
filemerge: use 'basic' as the default of '[ui] mergemarkers' for safetySun, 06 Jul 2014 02:56:41 +0900, by FUJIWARA Katsunori