view tests/test-confused-revert.out @ 2007:2ffa36dc3423

show committer's name on gitweb's summary page (issue 137)
author TK Soh <teekaysoh@yahoo.com>
date Sun, 26 Mar 2006 07:28:52 -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