Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1748:2428e6d66f06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: fix for recent changes disallowing "false" merges
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 19 Feb 2006 18:59:20 +0100
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