view tests/test-issue842.out @ 11077:132d783d6a87

Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Sat, 01 May 2010 15:14:22 -0500
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