tests/test-issue842.out
author Steve Borho <steve@borho.org>
Thu, 18 Feb 2010 23:23:17 -0600
changeset 10512 261cc6b0f15c
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