Mercurial > hg
comparison tests/test-rename-merge2.t @ 29975:c15f06109b7a
localrepo: use single quotes in use warning
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Tue, 20 Sep 2016 23:48:08 +0000 |
| parents | 978b907d9b36 |
| children | 940c05b25b07 |
comparison
equal
deleted
inserted
replaced
| 29974:7109d5ddeb0c | 29975:c15f06109b7a |
|---|---|
| 717 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | 717 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
| 718 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 718 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 719 -------------- | 719 -------------- |
| 720 M a | 720 M a |
| 721 M b | 721 M b |
| 722 abort: unresolved merge conflicts (see "hg help resolve") | 722 abort: unresolved merge conflicts (see 'hg help resolve') |
| 723 -------------- | 723 -------------- |
| 724 | 724 |
| 725 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" | 725 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
| 726 created new head | 726 created new head |
| 727 -------------- | 727 -------------- |
| 762 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | 762 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
| 763 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 763 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 764 -------------- | 764 -------------- |
| 765 M b | 765 M b |
| 766 C a | 766 C a |
| 767 abort: unresolved merge conflicts (see "hg help resolve") | 767 abort: unresolved merge conflicts (see 'hg help resolve') |
| 768 -------------- | 768 -------------- |
| 769 | 769 |
| 770 $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" | 770 $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
| 771 created new head | 771 created new head |
| 772 -------------- | 772 -------------- |