view tests/test-issue842.out @ 11716:db426935fa94 stable

progress: use gerund (updating) for merge progress
author timeless <timeless@gmail.com>
date Fri, 30 Jul 2010 10:32:24 +0300
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