tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 21 Aug 2006 21:59:29 -0700
changeset 2971 63c3a1921a67
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Add ui.strict config item. This turns off command matching by unambiguous prefix, and is a good thing if you want to write future-proof scripts. This fixes issue 314.

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