view tests/test-issue842.out @ 12117:a40372c1c731

tests: unify test-resolve
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 30 Aug 2010 14:06:18 +0900
parents 4b0c9c674707
children
line wrap: on
line source

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