log tests/test-merge10 @ 11692:52e4ac3e63f7 stable

age author description
Sun, 26 Apr 2009 14:49:49 +0200 Martin Geisler tests: removed redundant "-u test" from test scripts
Sat, 23 Jun 2007 22:43:46 -0500 Giorgos Keramidas tests: add merge test for changeset 9fe267f77f56