tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 Jun 2007 13:24:34 -0500
changeset 4619 7c8f8b736365
parent 3592 fffc8a733bf9
permissions -rw-r--r--
extensions: kill ui readhooks Move .hgrc extension loading into localrepo

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