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

adding base
foo/renamed
renamed
bar/renamed
renamed
baz
.hg/patches/baz