| Sat, 28 Apr 2007 17:55:45 -0300 |
Alexis S. L. Carvalho |
run-tests.py: pass -L/--label to simplemerge
|
| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
| 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.
|
| Wed, 22 Feb 2006 15:42:48 +0100 |
Peter van Dijk |
small solaris portability fixes from John Levon <levon@movementarian.org>
|
| 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
|
| Sat, 02 Jul 2005 22:54:35 -0800 |
mpm |
options: kill -d for debug
|
| Thu, 30 Jun 2005 23:28:16 -0800 |
mpm |
Merge with TAH
|
| Fri, 01 Jul 2005 07:22:27 +0100 |
Thomas Arendsen Hein |
Remove bashisms and use /bin/sh instead of /bin/bash.
|
| Fri, 17 Jun 2005 08:50:55 -0800 |
mpm |
Tidy up conflict and pull tests
|
| Wed, 15 Jun 2005 00:27:20 -0800 |
mpm |
merge3: fix argument order
|
