tests/test-issue842.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Mon, 30 Aug 2010 14:06:18 +0900
changeset 12117 a40372c1c731
parent 6336 4b0c9c674707
permissions -rw-r--r--
tests: unify test-resolve

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