##// END OF EJS Templates
i18n-pt_BR: synchronized with 552e0cfbddbd
i18n-pt_BR: synchronized with 552e0cfbddbd

File last commit:

r10874:4f11978a stable
r12596:e356c5c2 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