Mercurial > hg-stable
graph
-
rebase: specify custom conflict marker labels for rebase (BC)Thu, 08 May 2014 16:55:56 -0700, by Durham Goode
-
graft: customize graft conflict markers (BC)Fri, 09 May 2014 18:15:02 -0700, by Durham Goode
-
merge: add labels parameter from merge.update to filemergeThu, 08 May 2014 16:54:23 -0700, by Durham Goode