diff tests/test-log.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 c7c6f1a45348
children 7db88b094b14
line wrap: on
line diff