u/pc/rhodecode-enterprise-ce-fork-pc Files · rhodecode/tests/fixtures/git_diff_rename_file.diff

vcs: Return merge reference in merge response....

vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1051:668a5e47

default

Download file

             git_diff_rename_file.diff
        
                    4 lines
            
             | 107 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / rhodecode / tests / fixtures / git_diff_rename_file.diff
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      diff --git a/work-horus.xls b/file.xls

      similarity index 100%

      rename from work-horus.xls

      rename to file.xls

	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

marcink project: added all source files and assets	r1	diff --git a/work-horus.xls b/file.xls
		similarity index 100%
		rename from work-horus.xls
		rename to file.xls