Mercurial > hg
comparison tests/test-merge-local.t @ 18542:46be5c9dac91
merge: backout manifest sorting and workarounds for cost of it
Backout 8a811fa9a9c0 and 760c0d67ce5e which no longer are needed.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 04 Feb 2013 02:46:38 +0100 |
| parents | 2371f4aea665 |
| children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
| 18541:5ed6a375e9ca | 18542:46be5c9dac91 |
|---|