Mercurial > hg
comparison mercurial/commandserver.py @ 20593:3678707e4017 stable
merge: add "other" file node in the merge state file
This data is mostly redundant with the "other" changeset node (+ other changeset
file path). However, more data never hurt.
The old format do not store it so this require some dancing to add and remove it
on demand.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 25 Feb 2014 18:54:47 -0800 |
| parents | b04cc8651a63 |
| children | a42ea6d209e6 |
comparison
equal
deleted
inserted
replaced
| 20592:303cbfe3dcc8 | 20593:3678707e4017 |
|---|