view tests/test-issue842.out @ 6672:6004eedb13f4

keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
author Christian Ebert <blacktrash@gmx.net>
date Thu, 12 Jun 2008 02:27:06 +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