Thu, 27 Feb 2014 18:57:03 -0600 |
Matt Mackall |
merge with stable
|
Tue, 25 Feb 2014 18:45:01 -0800 |
Pierre-Yves David |
resolve: use "other" changeset from merge state (issue4163)
stable
|
Tue, 25 Feb 2014 18:54:47 -0800 |
Pierre-Yves David |
merge: add "other" file node in the merge state file
stable
|
Thu, 27 Feb 2014 14:14:57 -0800 |
Pierre-Yves David |
merge: infer the "other" changeset when falling back to v1 format
stable
|
Tue, 25 Feb 2014 18:42:11 -0800 |
Pierre-Yves David |
merge: record the "other" node in merge state
stable
|
Tue, 25 Feb 2014 18:37:06 -0800 |
Pierre-Yves David |
merge: introduce new format for the state file
stable
|
Thu, 27 Feb 2014 12:59:41 -0800 |
Pierre-Yves David |
merge: change the merge state serialisation to use a record based logic
stable
|