view tests/test-confused-revert.out @ 1453:6fbb13b7a59f

get command defaults from hgrc
author TK Soh <teekaysoh@yahoo.com>
date Wed, 26 Oct 2005 16:10:36 -0700
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