Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-command-template @ 4361:46280c004f22
change tests to use simplemerge by default
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | 5e857d72d3ac |
children | 3cf94964c56b |