log tests/test-merge10.out @ 6283:5a45c82fc7da

age author description
Wed, 16 Jan 2008 11:14:24 -0600 Matt Mackall diff: don't show function name by default
Sat, 23 Jun 2007 22:43:46 -0500 Giorgos Keramidas tests: add merge test for changeset 9fe267f77f56