##// END OF EJS Templates
merge: Resolved conflicts
merge: Resolved conflicts

File last commit:

r1:854a839a default
r5471:df8a724f merge v5.1.0 stable
Show More
git_diff_chmod.diff
3 lines | 77 B | text/x-diff | DiffLexer
diff --git a/work-horus.xls b/work-horus.xls
old mode 100644
new mode 100755