Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert.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 b2ae81a7df29
children 966632304dde
line wrap: on
line source

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file1
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip