view tests/test-revert.out @ 1770:4eea6a747c27

hgmerge: fix diff+patch detection; cleanups Details: - actually show help message when no tools are found - whitespace cleanup (stupid emacs) - quote more variables - simplify merge/diff3 error handling
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:09 -0600
parents 2bc6cd62a29c
children d436b21b20dc
line wrap: on
line source

%% should show b unknown
? b
%% should show b unknown and c modified
M c
? b
%% should show b added and c modified
M c
A b
%% should show a removed, b added and c modified
M c
A b
R a
%% should show b added and c modified
M c
A b
%% should show b unknown and c modified
M c
? b
%% should show b unknown
? b
%% should show a b and c
a
b
c