Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 2009:182f500805db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix broken hgignore tests due to full path showing up in output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 26 Mar 2006 22:54:05 +0200
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