tests/test-issue842.out
author Martin Geisler <mg@lazybytes.net>
Mon, 15 Mar 2010 18:36:11 +0100
changeset 10699 7b0a0d498cc0
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge with stable

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