tests/test-merge1.out
author mpm@selenic.com
Wed, 07 Sep 2005 20:50:23 -0700
changeset 1212 ccb6201e3f28
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
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.

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