tests/test-revert-unknown.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Tue, 21 Feb 2006 15:48:09 -0600
changeset 1770 4eea6a747c27
parent 1620 6c61646fee5e
child 2029 d436b21b20dc
permissions -rw-r--r--
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

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