Mercurial > hg

view tests/test-merge1.out @ 1047:a0538ea1ac50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved special handling of --version and no hg command from parse to dispatch. This allows e.g. 'hg status --version' to work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 26 Aug 2005 08:26:21 +0200
parents 5a034646e472
children 67a28636ea64
line wrap: on
line source

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b