view tests/test-merge5.out @ 8956:4b8d8f194e29

keyword: lowercase status flags of untracked files in kwfile output

Document the flags and their meanings in the command help
(thanks to timeless for bringing this to my attention).

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')