Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-imerge @ 5065:12930b97a729

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status.
author Brendan Cully <brendan@kublai.com>
date Sat, 04 Aug 2007 12:26:48 -0700
parents 86327d13d916
children 9cd6578750b9
comparison
equal deleted inserted replaced
5064:420e1166a876 5065:12930b97a729
25 hg imerge 25 hg imerge
26 26
27 cat foo2 27 cat foo2
28 cat bar 28 cat bar
29 29
30 echo % status 30 echo % status -v
31 hg imerge st 31 hg -v imerge st
32 32
33 echo % next 33 echo % next
34 hg imerge next 34 hg imerge next
35 35
36 echo % merge next 36 echo % merge next