tests/test-merge-closedheads.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 19 Jun 2009 13:47:50 +0200
changeset 8843 eb7b247a98ea
parent 8694 ca8d05e1f1d1
child 10355 a5576908b589
permissions -rw-r--r--
kill trailing whitespace

adding foo
adding bar
adding baz
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% fail with three heads
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: branch 'default' has 3 heads - please merge with an explicit rev
% close one of the heads
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
% succeed with two open heads
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)