view tests/test-issue842.out @ 8736:7619b16ea880

merge: fix prompt keep
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -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