view tests/test-mq-qrename.out @ 3305:e7abcf3a7c5f

filemerge: use contexts rather than my and other
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:27:04 -0500
parents 82c9d1aac308
children
line wrap: on
line source

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