Mercurial > hg

comparison tests/test-merge-default.out @ 5242:9cd6578750b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve error message for 'hg merge' when repo already at branchtip
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 25 Aug 2007 11:30:11 +0200
parents 013921c753bd
children 4b0c9c674707
comparison
equal deleted inserted replaced
5238:2b8373bda032 5242:9cd6578750b9
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 (branch merge, don't forget to commit) 12 (branch merge, don't forget to commit)
13 % should succeed - 2 heads 13 % should succeed - 2 heads
14 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 14 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
15 (branch merge, don't forget to commit) 15 (branch merge, don't forget to commit)
16 % should fail because at tip
17 abort: there is nothing to merge
18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 % should fail because 1 head 19 % should fail because 1 head
17 abort: there is nothing to merge - use "hg update" instead 20 abort: there is nothing to merge - use "hg update" instead