##// END OF EJS Templates
abort when merging two heads and repository has local changes
abort when merging two heads and repository has local changes

File last commit:

r1487:2bc6cd62 default
r1581:db10b711 default
Show More
test-revert.out
24 lines | 338 B | text/plain | TextLexer
%% 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