view tests/test-mq-qsave.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 ff3edd1c1e27
children
line wrap: on
line source

adding base
restoring status: hg patches saved state