##// END OF EJS Templates
Merge with i18n
Merge with i18n

File last commit:

r10874:4f11978a stable
r11160:fdcf80f2 merge 1.5.3 stable
Show More
test-update-renames.out
5 lines | 190 B | text/plain | TextLexer
/ tests / test-update-renames.out
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