tests/test-issue842.out
author Martin Geisler <mg@lazybytes.net>
Thu, 29 Apr 2010 23:47:07 +0200
changeset 11037 c1c534d62b05
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge with main

adding a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% should issue warning
adding a
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% should not issue warning
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch testing
% should not issue warning