Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1707:33d09f4a6fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Put the empty line in commit text above the branch merge line.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 09 Feb 2006 07:14:05 +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