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

RhodeCode Free Hosting

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

rhodecode-enterprise-ce

RSS

chore: fixed merge conflicts

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r5546:50cf7822

v5.2.0 stable

Download file

             hg_diff_copy_chmod_and_edit_file.diff
        
                    13 lines
            
             | 164 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / rhodecode / tests / fixtures / hg_diff_copy_chmod_and_edit_file.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff --git a/file4 b/file5

      old mode 100755

      new mode 100644

      copy from file4

      copy to file5

      --- a/file4

      +++ b/file5

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

      -line1

       line2

       line3

      +line4

      +line5

	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/file4 b/file5
				old mode 100755
				new mode 100644
				copy from file4
				copy to file5
				--- a/file4
				+++ b/file5
				@@ -1,3 +1,4 @@
				-line1
				line2
				line3
				+line4
				+line5