view tests/test-issue842.out @ 12047:dee1901a0ed8

merge with stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Aug 2010 17:55:07 +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