Mercurial > hg > pyhgsh
comparison tests/test-merge7.out @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Sun, 14 May 2006 21:07:34 -0700 |
| parents | b2ae81a7df29 |
| children |
comparison
equal
deleted
inserted
replaced
| 2282:2efa636eb411 | 2283:e506c14382fd |
|---|---|
| 20 adding file changes | 20 adding file changes |
| 21 added 1 changesets with 1 changes to 1 files (+1 heads) | 21 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 22 (run 'hg heads' to see heads, 'hg merge' to merge) | 22 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 23 merge: warning: conflicts during merge | 23 merge: warning: conflicts during merge |
| 24 resolving manifests | 24 resolving manifests |
| 25 force None allow 1 moddirstate True linear False | 25 force False allow True moddirstate True linear False |
| 26 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 | 26 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 |
| 27 test.txt versions differ, resolve | 27 test.txt versions differ, resolve |
| 28 merging test.txt | 28 merging test.txt |
| 29 resolving test.txt | 29 resolving test.txt |
| 30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 | 30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |