view tests/test-mq-qrename.out @ 3200:e67c22bc8bba

merge: use repo.parents and parent contexts in update
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 16:39:38 -0500
parents 82c9d1aac308
children
line wrap: on
line source

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