##// END OF EJS Templates
diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

File last commit:

r6338:0750f111 default
r7664:3cc74ee7 default
Show More
test-patch.out
12 lines | 323 B | text/plain | TextLexer
adding a
% check custom patch options are honored
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../a.diff
Using custom patch
nothing changed