view tests/test-issue842.out @ 9982:ddc899096b7b

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Dec 2009 14:37:33 -0600
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