Mercurial > hg-stable
graph
-
filemerge: use 'util.ellipsis' to trim custom conflict markers correctlySun, 06 Jul 2014 02:56:41 +0900, by FUJIWARA Katsunori
-
filemerge: use only the first line of the generated conflict marker for safetySun, 06 Jul 2014 02:56:41 +0900, by FUJIWARA Katsunori