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 |
Mon, 24 Nov 2014 16:11:22 -0800 | Martin von Zweigbergk | merge: indent to prepare for next patch | changeset | files |
Tue, 25 Nov 2014 17:30:05 -0600 | Matt Mackall | merge with stable | changeset | files |
Tue, 25 Nov 2014 02:31:52 -0600 | David Eckhardt | factotum: convert Plan 9 quoted string to Python string | changeset | files |