Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-conflict @ 5483:0c43f87baba3 default tip
age | author | description |
---|---|---|
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 |