log tests/test-up-local-change @ 5439:bfbd9b954315

age author description
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