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