Mercurial > hg
comparison tests/test-backout.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 | 0748083f2898 |
| children | 520defbc0335 |
comparison
equal
deleted
inserted
replaced
| 26516:eb9876aa8770 | 26517:d8463a743d7d |
|---|---|
| 618 branch: default | 618 branch: default |
| 619 commit: 1 unresolved (clean) | 619 commit: 1 unresolved (clean) |
| 620 update: (current) | 620 update: (current) |
| 621 phases: 3 draft | 621 phases: 3 draft |
| 622 $ hg resolve --all --debug | 622 $ hg resolve --all --debug |
| 623 picked tool 'internal:merge' for foo (binary False symlink False) | 623 picked tool ':merge' for foo (binary False symlink False) |
| 624 merging foo | 624 merging foo |
| 625 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 | 625 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 |
| 626 premerge successful | 626 premerge successful |
| 627 (no more unresolved files) | 627 (no more unresolved files) |
| 628 $ hg status | 628 $ hg status |