Mercurial > hg

view tests/test-merge1.out @ 1221:89f899caecb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clone: directory names take precedence over symbolic names If source matches both a directory name and a symbolic name to repo, the directory will be taken.
author TK Soh <teekaysoh@yahoo.com>
date Thu, 08 Sep 2005 12:10:59 -0700
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