Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default | file | diff | annotate |
Fri, 01 Dec 2006 13:34:09 +0100 | Benoit Boissinot | switch to the .hg/store layout, fix the tests | file | diff | annotate |
Sun, 14 May 2006 21:07:34 -0700 | Vadim Gelfer | deprecate 'update -m'. use 'merge' instead. | file | diff | annotate |
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. | file | diff | annotate |
Tue, 27 Sep 2005 14:53:11 -0700 | Matt Mackall | Make test-merge7 repeatable | file | diff | annotate |
Mon, 26 Sep 2005 16:52:47 -0700 | Matt Mackall | Repair ancestor logic, fix up test cases | file | diff | annotate |