##// END OF EJS Templates
merge git patch code.
merge git patch code.

File last commit:

r2864:e2b69dbb default
r2865:71e78f2c merge default
Show More
test-git-import.out
39 lines | 494 B | text/plain | TextLexer
% new file
applying patch from stdin
patching file new
% chmod +x
applying patch from stdin
% copy
applying patch from stdin
a
a
% rename
applying patch from stdin
copyx
new
rename
% delete
applying patch from stdin
patching file copyx
new
rename
% regular diff
applying patch from stdin
patching file rename
% copy and modify
applying patch from stdin
patching file copy2
a
a
b
a
a
% rename and modify
applying patch from stdin
patching file rename2
copy2: No such file or directory
a
a
b
c
a