Mercurial > hg
diff tests/test-update-renames.out @ 10874:4f11978ae45d stable
copies: properly visit file context ancestors on working file contexts
author | Henrik Stuart <henrik.stuart@edlund.dk> |
---|---|
date | Wed, 07 Apr 2010 21:31:47 +0200 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-update-renames.out Wed Apr 07 21:31:47 2010 +0200 @@ -0,0 +1,5 @@ +merging a and b to b +warning: conflicts during merge. +merging b failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges