| Thu, 02 Sep 2010 23:22:51 +0200 | Martin Geisler | tests: remove unneeded -d flags | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default | file | diff | annotate |
| Mon, 11 Dec 2006 18:09:52 +0100 | Thomas Arendsen Hein | Add instructions how to redo/finish failed merge with local working directory. | file | diff | annotate |