Mercurial > hg

view tests/test-merge5.out @ 9493:fe1ecd15c6bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 30 Sep 2009 23:59:03 +0200
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')