log tests/test-merge-local.out @ 4537:2f489b00f8eb

age author description
Tue, 08 May 2007 11:42:48 -0500 Matt Mackall Merge with stable