Mercurial > hg
changeset 3281:f49c90b46897
Update test output
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 06 Oct 2006 17:14:50 -0500 |
| parents | 45b639607e52 |
| children | 438b0638dbf5 d89e98840b08 |
| files | tests/test-rename-merge2.out |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Fri Oct 06 17:14:18 2006 -0500 +++ b/tests/test-rename-merge2.out Fri Oct 06 17:14:50 2006 -0500 @@ -302,7 +302,7 @@ -------------- -------------- -test L:nc a b R:up a b W: - 16 merge a, merge b no ancestor +test L:nc a b R:up a b W: - 16 get a, merge b no ancestor -------------- resolving manifests overwrite None branchmerge True partial False @@ -325,7 +325,7 @@ -------------- -------------- -test L:up a b R:nc a b W: - 17 merge a, merge b no ancestor +test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor -------------- resolving manifests overwrite None branchmerge True partial False @@ -369,7 +369,7 @@ -------------- -------------- -test L:up a b R:nm a b W: - 19 merge b no ancestor, remove a +test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a -------------- resolving manifests overwrite None branchmerge True partial False