log tests/test-merge1.out @ 4388:80c7fa620a4d

age author description
Wed, 01 Nov 2006 21:47:55 -0600 Matt Mackall Clarify untracked file merge message