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

vcs: Add merge failure reasons for missing target ref and missing source ref.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1067:6613f04b

default

Download file

             hg_diff_four_file_change_newline.diff
        
                    24 lines
            
             | 419 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / rhodecode / tests / fixtures / hg_diff_four_file_change_newline.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff --git a/file b/file

      new file mode 100644

      --- /dev/null

      +++ b/file

      @@ -0,0 +1,1 @@

      +file

      diff --git a/file2 b/file2

      new file mode 100644

      --- /dev/null

      +++ b/file2

      @@ -0,0 +1,1 @@

      +another line

      diff --git a/file3 b/file3

      new file mode 100644

      --- /dev/null

      +++ b/file3

      @@ -0,0 +1,1 @@

      +newline

      diff --git a/file4 b/file4

      new file mode 100644

      --- /dev/null

      +++ b/file4

      @@ -0,0 +1,1 @@

      +fil4

      \ No newline at end of file

	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/file b/file
				new file mode 100644
				--- /dev/null
				+++ b/file
				@@ -0,0 +1,1 @@
				+file
				diff --git a/file2 b/file2
				new file mode 100644
				--- /dev/null
				+++ b/file2
				@@ -0,0 +1,1 @@
				+another line
				diff --git a/file3 b/file3
				new file mode 100644
				--- /dev/null
				+++ b/file3
				@@ -0,0 +1,1 @@
				+newline
				diff --git a/file4 b/file4
				new file mode 100644
				--- /dev/null
				+++ b/file4
				@@ -0,0 +1,1 @@
				+fil4
				\ No newline at end of file