Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2971:63c3a1921a67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 21 Aug 2006 21:59:29 -0700
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line source

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