changeset 5224 | 9cd6578750b9 |
parent 5065 | 12930b97a729 |
--- a/tests/test-imerge.out +++ b/tests/test-imerge.out @@ -41,5 +41,8 @@ description: merged +% nothing to merge -- tip +abort: there is nothing to merge +2 files updated, 0 files merged, 1 files removed, 0 files unresolved % nothing to merge abort: there is nothing to merge - use "hg update" instead