tests/test-issue842.out
author Matt Mackall <mpm@selenic.com>
Sat, 20 Mar 2010 10:01:56 -0500
changeset 10746 16b9aa398c28
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