##// END OF EJS Templates
util: test fileno() availability in win32 set_binary()...
util: test fileno() availability in win32 set_binary() Fix suggested by Alexander Belchenko <bialix@ukr.net>

File last commit:

r6256:69c75d06 default
r6330:4e836769 default
Show More
test-merge-force.out
10 lines | 281 B | text/plain | TextLexer
/ tests / test-merge-force.out
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b