Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 1515:3bd6d27cb81c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up test-help, mark test-rename +x
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Nov 2005 10:36:23 -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