log tests/test-merge-types.out @ 7012:78341ea65d16

age author description
Fri, 21 Mar 2008 11:06:02 +0100 Dirkjan Ochtman warn about new heads on commit (issue842)
Thu, 27 Dec 2007 23:55:36 -0600 Matt Mackall update test-merge-types
Wed, 07 Nov 2007 14:38:04 -0600 Matt Mackall Mark failing test as a known bug