upstream/mercurial-mirror Files · hgext/__init__.py

filemerge: use 'util.ellipsis' to trim custom conflict markers correctly...

filemerge: use 'util.ellipsis' to trim custom conflict markers correctly Before this patch, filemerge slices byte sequence directly to trim conflict markers, but this may cause: - splitting at intermediate multi-byte sequence - incorrect calculation of column width (length of byte sequence is different from columns in display in many cases) This patch uses 'util.ellipsis' to trim custom conflict markers correctly, even if multi-byte characters are used in them.

Matt Mackall - - Load All Authors

File last commit:

r1360:7d439981 default


                r21865:78e56e70

default

Download file

             __init__.py
        
                    1 line
            
             | 14 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
Re-add hgext/__init__.py

              r1360
            
      # placeholder

	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