tests/test-merge5.out
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun, 08 Aug 2010 22:49:01 +0200
changeset 11767 9b771b4ce2f3
parent 9717 68a1b9d0663e
permissions -rw-r--r--
mq/qqueue: --list does not print (active) with --quiet For scripting purposes, it can be convenient to get a simple listing of available queues, without indication of the active one. --quiet documentation change removed by Patrick Mézard.

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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved