Mon, 24 Nov 2014 16:17:02 -0800 | Martin von Zweigbergk | merge: use None as filename for base in 'both created' conflicts | changeset | files |
Mon, 24 Nov 2014 16:42:36 -0800 | Martin von Zweigbergk | merge: break out "both renamed a -> b" case | changeset | files |
Mon, 24 Nov 2014 16:16:34 -0800 | Martin von Zweigbergk | merge: separate out "both created" cases | changeset | files |