log tests/test-conflict.out @ 5058:a3d6de2838de

age author description
Sat, 28 Apr 2007 17:55:45 -0300 Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)