##// END OF EJS Templates
tests: unify test-addremove-similar
tests: unify test-addremove-similar

File last commit:

r10874:4f11978a stable
r11851:db955418 default
Show More
test-update-renames.out
5 lines | 190 B | text/plain | TextLexer
/ tests / test-update-renames.out
Henrik Stuart
copies: properly visit file context ancestors on working file contexts
r10874 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