view tests/test-issue842.out @ 6531:c2c4fa9af016

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 12 Apr 2008 23:05:51 -0400
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