tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 22 Aug 2005 03:41:09 -0700
changeset 1001 ab3939ccbf10
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Emacs: update mode lines properly after commit.

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