log tests/test-merge6 @ 2328:f789602ba840

age author description
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
Mon, 13 Mar 2006 13:05:41 +0100 Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
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
Mon, 04 Jul 2005 12:54:42 -0800 Matt Mackall update tests
Mon, 04 Jul 2005 12:38:34 -0800 maf46 Fix zombie files in merge