Mercurial > hg
view tests/test-inotify.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 | 92c952c4470c |
children | f90bbf1ea09f |
line wrap: on
line source
adding a adding b adding c adding d adding dir/bar/foo adding dir/x adding dir/y adding e % inserve ? hg.pid % clean C a C b C c C d C dir/bar/foo C dir/x C dir/y C e % all ? hg.pid C a C b C c C d C dir/bar/foo C dir/x C dir/y C e % path patterns M dir/x ? hg.pid M dir/x M x