Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-branches.out @ 5227:a1efa71f3ece

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve extdiff configuration. In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple alias = command [opts]... form. For example: [extdiff] cdiff = colordiff -uprN
author Brendan Cully <brendan@kublai.com>
date Sat, 25 Aug 2007 12:25:53 -0700
parents 6858a7477a5e
children
line wrap: on
line source

marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch c
c                              5:5ca481e59b8c
a                              1:dd6b440dd85a
b                              4:22df7444f7c1 (inactive)
default                        0:19709c5a4e75 (inactive)
-------
c                              5:5ca481e59b8c
a                              1:dd6b440dd85a