Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1978:10606ee61107

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do proper typecasting on malloc() and calloc() calls to support build on Solaris 2.6 using Sun Pro SC4.0 (C++ 4.1) compiler.
author TK Soh <teekaysoh@yahoo.com>
date Mon, 20 Mar 2006 08:46:29 +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