Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge7.out @ 4361:46280c004f22
age | author | description |
---|---|---|
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default |
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying |