view tests/test-parseindex.out @ 3407:d2b55e3c4e25

merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents 6563438219e3
children
line wrap: on
line source

changeset:   0:9c2cf2b35aa7
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add foo

changeset:   1:3756a9556b89
tag:         tip
user:        test
date:        Mon Jan 12 13:46:41 1970 +0000
summary:     change foo

2 revisions:
9c2cf2b35aa7
3756a9556b89