tests/test-confused-revert.out
author TK Soh <teekaysoh@yahoo.com>
Tue, 14 Mar 2006 22:01:30 -0800
changeset 1953 379ab45b91b7
parent 1449 30146be3437c
child 2029 d436b21b20dc
permissions -rw-r--r--
change default strftime format for better portability On some systems, such as Solaris and HP-UX, "%c" format give output without the leading zero on the single-digit month-day.

%%% 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