Mercurial > hg
comparison tests/test-up-local-change.t @ 29350:35861cc1076e
tests: drop a duplicated instruction
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Sat, 11 Jun 2016 20:59:49 +0200 |
| parents | 564a354f7f35 |
| children | a2804ddcf9ae |
comparison
equal
deleted
inserted
replaced
| 29349:8bf84295e59b | 29350:35861cc1076e |
|---|---|
| 82 picked tool 'true' for a (binary False symlink False changedelete False) | 82 picked tool 'true' for a (binary False symlink False changedelete False) |
| 83 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | 83 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
| 84 launching merge tool: true *$TESTTMP/r2/a* * * (glob) | 84 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
| 85 merge tool returned: 0 | 85 merge tool returned: 0 |
| 86 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | 86 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
| 87 $ hg parents | |
| 88 changeset: 0:c19d34741b0a | |
| 89 user: test | |
| 90 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 91 summary: 1 | |
| 92 | |
| 93 $ hg parents | 87 $ hg parents |
| 94 changeset: 0:c19d34741b0a | 88 changeset: 0:c19d34741b0a |
| 95 user: test | 89 user: test |
| 96 date: Thu Jan 01 00:00:00 1970 +0000 | 90 date: Thu Jan 01 00:00:00 1970 +0000 |
| 97 summary: 1 | 91 summary: 1 |