Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-conflict.out @ 5007:c2febf5420e9
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 |
Tue, 02 May 2006 18:44:02 +0200 | Thomas Arendsen Hein | Make hg update more verbose by default (issue12) |
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. |
Tue, 16 Aug 2005 19:03:01 -0800 | mpm | run-tests: remove '+ hg' trick |
Sat, 30 Jul 2005 09:00:14 -0800 | mpm | Merge with BOS |
Sat, 30 Jul 2005 08:35:29 -0800 | mpm | Merge with TAH |