author | Paolo Giarrusso <p.giarrusso@gmail.com> |
Sat, 21 Aug 2010 00:33:13 +0200 | |
branch | stable |
changeset 12218 | 0bd15f88e8eb |
parent 10874 | 4f11978ae45d |
permissions | -rw-r--r-- |
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 |