log tests/test-merge1 @ 1163:dacd3463ee3f

age author description
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS
Sat, 30 Jul 2005 08:35:29 -0800 mpm Merge with TAH
Fri, 29 Jul 2005 15:19:43 +0100 Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
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