Mercurial > hg
comparison tests/test-subrepo.t @ 26517:d8463a743d7d
filemerge: normalize 'internal:foo' names to ':foo'
In upcoming patches we're going to present these names in the UI -- it would be
good not to present deprecated names.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 07 Oct 2015 00:01:16 -0700 |
| parents | fe03f522dda9 |
| children | 56b2bcea2529 |
comparison
equal
deleted
inserted
replaced
| 26516:eb9876aa8770 | 26517:d8463a743d7d |
|---|---|
| 295 resolving manifests | 295 resolving manifests |
| 296 branchmerge: True, force: False, partial: False | 296 branchmerge: True, force: False, partial: False |
| 297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 | 297 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
| 298 preserving t for resolve of t | 298 preserving t for resolve of t |
| 299 t: versions differ -> m | 299 t: versions differ -> m |
| 300 picked tool 'internal:merge' for t (binary False symlink False) | 300 picked tool ':merge' for t (binary False symlink False) |
| 301 merging t | 301 merging t |
| 302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | 302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
| 303 warning: conflicts during merge. | 303 warning: conflicts during merge. |
| 304 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') | 304 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 305 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 305 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |