Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-conflict @ 5263:d59ed18ec2d0
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. |