upstream/mercurial-mirror Files · tests/test-commit-unresolved.out

templatefilters: add filter to convert date to local date (issue1674)...

templatefilters: add filter to convert date to local date (issue1674) Issue1674 suggests the localdate filter be applied as default to log, but this patch only introduces the filter, not the changed default behaviour.

Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default


                r8591:08c93b07

default

Download file

             test-commit-unresolved.out
        
                    14 lines
            
             | 481 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-commit-unresolved.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				created new head

				% Merging a conflict araises
				merging A
				warning: conflicts during merge.
				merging A failed!
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon

				% Correct the conflict without marking the file as resolved
				abort: unresolved merge conflicts (see hg resolve)

				% Mark the conflict as resolved and commit

	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