Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/ui.py @ 31134:13bbcd56c57a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Feb 2017 11:13:25 -0800
parents f5131d4f512a 4431add9aef9
children 791ea883fc44
comparison
equal deleted inserted replaced
31133:6483e49204ee 31134:13bbcd56c57a
68 default = %s 68 default = %s
69 69
70 # path aliases to other clones of this repo in URLs or filesystem paths 70 # path aliases to other clones of this repo in URLs or filesystem paths
71 # (see 'hg help config.paths' for more info) 71 # (see 'hg help config.paths' for more info)
72 # 72 #
73 # default-push = ssh://jdoe@example.net/hg/jdoes-fork 73 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
74 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork 74 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
75 # my-clone = /home/jdoe/jdoes-clone 75 # my-clone = /home/jdoe/jdoes-clone
76 76
77 [ui] 77 [ui]
78 # name and email (local to this repository, optional), e.g. 78 # name and email (local to this repository, optional), e.g.
79 # username = Jane Doe <jdoe@example.com> 79 # username = Jane Doe <jdoe@example.com>
80 """, 80 """,
83 """# example repository config (see 'hg help config' for more info) 83 """# example repository config (see 'hg help config' for more info)
84 [paths] 84 [paths]
85 # path aliases to other clones of this repo in URLs or filesystem paths 85 # path aliases to other clones of this repo in URLs or filesystem paths
86 # (see 'hg help config.paths' for more info) 86 # (see 'hg help config.paths' for more info)
87 # 87 #
88 # default = http://example.com/hg/example-repo 88 # default = http://example.com/hg/example-repo
89 # default-push = ssh://jdoe@example.net/hg/jdoes-fork 89 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
90 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork 90 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
91 # my-clone = /home/jdoe/jdoes-clone 91 # my-clone = /home/jdoe/jdoes-clone
92 92
93 [ui] 93 [ui]
94 # name and email (local to this repository, optional), e.g. 94 # name and email (local to this repository, optional), e.g.
95 # username = Jane Doe <jdoe@example.com> 95 # username = Jane Doe <jdoe@example.com>
96 """, 96 """,