u/pc/rhodecode-enterprise-ce-fork-pc Files · rhodecode/tests/fixtures/hg_diff_mixed_filename_encodings.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

             hg_diff_mixed_filename_encodings.diff
        
                    6 lines
            
             | 220 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / rhodecode / tests / fixtures / hg_diff_mixed_filename_encodings.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff --git a/späcial-utf8.txt b/späcial-utf8.txt

      new file mode 100644

      diff --git a/sp�cial-cp1252.txt b/sp�cial-cp1252.txt

      new file mode 100644

      diff --git a/sp�cial-latin1.txt b/sp�cial-latin1.txt

      new file mode 100644

	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/späcial-utf8.txt b/späcial-utf8.txt
				new file mode 100644
				diff --git a/sp�cial-cp1252.txt b/sp�cial-cp1252.txt
				new file mode 100644
				diff --git a/sp�cial-latin1.txt b/sp�cial-latin1.txt
				new file mode 100644