Mercurial > hg
annotate tests/test-update-renames.out @ 12611:1f6bd49383b3 stable
Added signature for changeset 93d8bff78c96
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 01 Oct 2010 10:18:57 -0500 |
parents | 4f11978ae45d |
children |
rev | line source |
---|---|
10874
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
1 merging a and b to b |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
2 warning: conflicts during merge. |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
3 merging b failed! |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
4 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
4f11978ae45d
copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
5 use 'hg resolve' to retry unresolved file merges |