Mercurial > hg > mercurial-crew-with-dirclash
diff contrib/macosx/Welcome.html @ 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 | 1ef8ada4370f |
children | fb4b6d5fe100 |