Mercurial > hg-stable
graph
-
merge: use None as filename for base in 'both created' conflictsMon, 24 Nov 2014 16:17:02 -0800, by Martin von Zweigbergk
-
merge: break out "both renamed a -> b" caseMon, 24 Nov 2014 16:42:36 -0800, by Martin von Zweigbergk
-
merge: separate out "both created" casesMon, 24 Nov 2014 16:16:34 -0800, by Martin von Zweigbergk