tests/test-merge5.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 05 Nov 2009 14:44:29 +0100
changeset 9721 1d75c683ada1
parent 9717 68a1b9d0663e
permissions -rw-r--r--
templater: put 'ago' inside the age template filter

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