tests/test-merge3.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 20:17:39 -0300
changeset 4365 46280c004f22
parent 1747 91c56c427171
permissions -rw-r--r--
change tests to use simplemerge by default

removing b
nothing changed