Mercurial > hg
view tests/test-update-renames.out @ 11203:7a9cf012dddc
rebase: only show "rebase completed" message with -v
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 May 2010 15:15:11 -0500 |
parents | 4f11978ae45d |
children |
line wrap: on
line source
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