Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-default.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 9cd6578750b9
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
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