Thu, 21 Jun 2007 09:25:49 +0200 |
Thomas Arendsen Hein |
Kill trailing spaces
|
Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
Tue, 26 Sep 2006 00:05:24 +0100 |
Stephen Darnell |
Add -D/--nodates options to hg diff/export that removes dates from diff headers
|
Sun, 14 May 2006 21:07:34 -0700 |
Vadim Gelfer |
deprecate 'update -m'. use 'merge' instead.
|
Fri, 14 Apr 2006 00:41:50 +0200 |
Benoit Boissinot |
fix update when a locally added file match the target revision
|
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, 01 Feb 2006 08:46:24 +0100 |
Benoit Boissinot |
abort when using 'update -m' and this is not a merge
|
Wed, 14 Dec 2005 22:19:03 -0600 |
Benoit Boissinot |
abort when merging two heads and repository has local changes
|
Sat, 20 Aug 2005 13:08:07 -0700 |
mpm |
Merge with jeffpc
|
Fri, 19 Aug 2005 16:45:25 -0800 |
mpm |
Merge with TAH
|
Thu, 18 Aug 2005 13:33:39 +0100 |
TK Soh |
test fixes for Solaris 2.6
|
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.
|
Fri, 29 Jul 2005 06:43:21 +0100 |
Thomas Arendsen Hein |
Merge with upstream
|