view tests/test-committer.out @ 3400: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 f1085d34d20d
children 8b55c0ba8048
line wrap: on
line source

changeset:   0:9426b370c206
tag:         tip
user:        My Name <myname@example.com>
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     commit-1