tests/test-mq-qrename.out
author Matt Mackall <mpm@selenic.com>
Sun, 03 Feb 2008 19:29:05 -0600
changeset 6009 f077815932ce
parent 3083 82c9d1aac308
child 6649 05a682c8907d
permissions -rw-r--r--
filemerge: remove the hgmerge script This is now better handled using [merge-tools] and [merge-patterns] in hgrc.

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