Mercurial > hg
graph
-
filemerge: add non-interactive :merge-local and :merge-otherThu, 10 Sep 2015 09:41:11 -0400, by Jordi GutiƩrrez Hermoso
-
simplemerge: enable option to resolve conflicts one wayWed, 12 Aug 2015 08:53:01 -0400, by Jordi GutiƩrrez Hermoso