log tests/test-merge-revert.out @ 4780:8b90d763ea90

age author description
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated