view tests/test-execute-bit.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 865c5be0f8df
children a964ab624385
line wrap: on
line source

adding a
79abf14474dc tip
% make sure we notice the change of mode if the cached size == -1
n   0         -1 unset               a
M a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d69afc33ff8a
not executable -- whew