equal
deleted
inserted
replaced
22 + hg addremove |
22 + hg addremove |
23 + hg commit -t 2 -u test -d '0 0' |
23 + hg commit -t 2 -u test -d '0 0' |
24 + cd ../r2 |
24 + cd ../r2 |
25 + hg -q pull ../r1 |
25 + hg -q pull ../r1 |
26 + hg status |
26 + hg status |
27 C a |
27 M a |
28 + hg --debug up |
28 + hg --debug up |
29 resolving manifests |
29 resolving manifests |
30 force None allow None moddirstate True linear True |
30 force None allow None moddirstate True linear True |
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
32 a versions differ, resolve |
32 a versions differ, resolve |