##// END OF EJS Templates
chore: fixed merge conflicts
chore: fixed merge conflicts

File last commit:

r1:854a839a default
r5546:50cf7822 merge v5.2.0 stable
Show More
git_diff_binary_special_files_2.diff
2 lines | 150 B | text/x-diff | DiffLexer
/ rhodecode / tests / fixtures / git_diff_binary_special_files_2.diff
project: added all source files and assets
r1 diff --git "a/css/Icon\r" "b/css/Icon\r"
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391