tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 23 Mar 2007 00:12:28 -0500
changeset 4273 8185a1ca8628
parent 3592 fffc8a733bf9
permissions -rw-r--r--
tags: require -f to replace an existing tag based on a patch from Johan Herland <johherla@online.no>

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes