log tests/test-merge1 @ 546:c8ae964109c1

age author description
Tue, 21 Jun 2005 21:07:08 -0800 mpm Fix up test-merge1
Tue, 21 Jun 2005 18:41:57 -0800 mpm [PATCH] Merging identical changes from another branch