Mercurial > hg

comparison tests/test-imerge @ 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 12930b97a729
children 5c5e45766224
comparison
equal deleted inserted replaced
5238:2b8373bda032 5242:9cd6578750b9
52 cat foo2 52 cat foo2
53 53
54 hg ci -m'merged' -d '3 0' 54 hg ci -m'merged' -d '3 0'
55 hg tip -v 55 hg tip -v
56 56
57 echo % nothing to merge -- tip
58 hg imerge
59
60 hg up 0
57 echo % nothing to merge 61 echo % nothing to merge
58 hg imerge 62 hg imerge
59 63
60 exit 0 64 exit 0