##// 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
hg_diff_mod_single_file_and_rename_and_chmod.diff
14 lines | 194 B | text/x-diff | DiffLexer
/ rhodecode / tests / fixtures / hg_diff_mod_single_file_and_rename_and_chmod.diff
History | Annotation | Raw |Copy content |Copy permalink
diff --git a/README.rst b/README
old mode 100755
new mode 100644
rename from README.rst
rename to README
--- a/README.rst
+++ b/README
@@ -1,4 +1,7 @@
readme2
line 1
line2
+line 1
+ line2
+