##// 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:

r1258:1945754e default
r1581:db10b711 default
Show More
test-encode.out
8 lines | 180 B | text/plain | TextLexer
%% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
%% uncompress our new working dir copy
this is a test