log tests/test-merge1.out @ 803:3d47e7fc33a3

age author description
Fri, 29 Jul 2005 15:21:02 +0100 Thomas Arendsen Hein Updated output of tests.
Thu, 21 Jul 2005 15:05:17 -0500 mpm Update tests to use commit -m and default -u
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