##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
pull-requests: fixed case for GIT repositories when a merge check failed due to merge conflicts the pull request wrongly reported missing commits....
pull-requests: fixed case for GIT repositories when a merge check failed due to merge conflicts the pull request wrongly reported missing commits. - we're now searching for dangling commits in a repo that has them and cannot see them because of failed merge checks. - pull-request: will save metadata during merge simulation so merge conflicts are permanently stored, and showed to all users.
marcink - - Load All Authors

File last commit:

r1:854a839a default
r4299:04e45b92 default
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
History | Annotation | Raw |Copy content |Copy permalink
diff --git "a/css/Icon\r" "b/css/Icon\r"
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391