log tests/test-merge1.out @ 5424:005638db9d0c

age author description
Wed, 01 Nov 2006 21:47:55 -0600 Matt Mackall Clarify untracked file merge message
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Wed, 11 Oct 2006 16:41:52 +0200 Benoit Boissinot merge with crew