upstream/mercurial-mirror Files · tests/test-diff-color.out

fetch: do not count inactive branches when inferring a merge...

fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.

Brodie Rao - - Load All Authors

File last commit:

r7459:3fb5c142 default


                r7854:423b4482

default

Download file

             test-diff-color.out
        
                    25 lines
            
             | 333 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-diff-color.out

History | Annotation | Raw |Copy content |Copy permalink

				adding a
				% default context
				[0;1mdiff -r cf9f4ba66af2 a[0m
				[0;31;1m--- a/a[0m
				[0;32;1m+++ b/a[0m
				[0;35m@@ -2,7 +2,7 @@[0m
				c
				a
				a
				[0;31m-b[0m
				[0;32m+dd[0m
				a
				a
				c
				% --unified=2
				[0;1mdiff -r cf9f4ba66af2 a[0m
				[0;31;1m--- a/a[0m
				[0;32;1m+++ b/a[0m
				[0;35m@@ -3,5 +3,5 @@[0m
				a
				a
				[0;31m-b[0m
				[0;32m+dd[0m
				a
				a

	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