Mercurial > hg

view tests/test-merge1.out @ 1212:ccb6201e3f28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change grep -e to grep --all We want to reserve -e for future use and grep compatibility. I've changed every-match to all out of a general preference for shorter long option names where short options don't exist.
author mpm@selenic.com
date Wed, 07 Sep 2005 20:50:23 -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