view tests/test-revert-unknown.out @ 1664:4338e33c973b

Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents 6c61646fee5e
children d436b21b20dc
line wrap: on
line source

%% Should show unknown
? unknown
%% Should show unknown and b removed
! b
? unknown
%% Should show a and unknown
a
unknown