diff tests/test-mq-guards.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 851b07ec450c
children 193e9c6d1a6d
line wrap: on
line diff