Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1067:fae1204603dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed zero-padded filenames with %r if there is a longer number in the middle. e.g. with: hg export -o ../%r.patch 99 100 98
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 26 Aug 2005 16:37:28 +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