comparison doc/hgrc.5.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 fe41d9a186ab
children aac150af09e8
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22