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

vcs: use a real two part name for merge operation....

vcs: use a real two part name for merge operation. - expose settings into vcs_settings for easier override later

marcink - - Load All Authors

File last commit:

r1259:8e9f93ec default


                r3040:dcaa9d67

stable

Download file

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

      ===================================================================

      Cannot display: file marked as a binary type.

      svn:mime-type = application/octet-stream

      Index: intl.dll

      ===================================================================

      diff --git a/intl.dll b/intl.dll

      new file mode 10644

      --- /dev/null	(revision 0)

      +++ b/intl.dll	(revision 1489)

	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

				===================================================================
				Cannot display: file marked as a binary type.
				svn:mime-type = application/octet-stream
				Index: intl.dll
				===================================================================
				diff --git a/intl.dll b/intl.dll
				new file mode 10644
				--- /dev/null (revision 0)
				+++ b/intl.dll (revision 1489)