rhodecode-enterprise-ce Files · rhodecode/tests/fixtures/hg_diff_mod_file_and_rename.diff

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

Download file

             hg_diff_mod_file_and_rename.diff
        
                    9 lines
            
             | 145 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / rhodecode / tests / fixtures / hg_diff_mod_file_and_rename.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff --git a/README b/README.rst

      rename from README

      rename to README.rst

      --- a/README

      +++ b/README.rst

      @@ -1,1 +1,4 @@

       readme2

      +line 1

      + line2

      +

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff --git a/README b/README.rst
				rename from README
				rename to README.rst
				--- a/README
				+++ b/README.rst
				@@ -1,1 +1,4 @@
				readme2
				+line 1
				+ line2
				+