view tests/test-confused-revert.out @ 1995:2da2d46862fb

Spelling fix: "commited" -> "committed"
author mcmillen@cs.cmu.edu
date Fri, 24 Mar 2006 14:53:23 +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