Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1528:c9f33196805b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add an atomic argument to util.opener when atomic is used, the file while be renamed on close
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 11 Nov 2005 15:33:59 -0800
parents 30146be3437c
children d436b21b20dc
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b