Mercurial > hg > mercurial-crew-with-dirclash
diff doc/ja/hgmerge.1.ja.txt @ 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 | 345bac2bc4ec |
children | 63b9d2deed48 |