view tests/test-issue842.out @ 10879:29030b7f664a

merge default
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 09 Apr 2010 15:16:31 +0200
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