Mercurial > public > mercurial-scm > hg
diff mercurial/ui.py @ 31119:13bbcd56c57a
merge with stable
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 28 Feb 2017 11:13:25 -0800 |
| parents | f5131d4f512a 4431add9aef9 |
| children | 791ea883fc44 |
line wrap: on
line diff
--- a/mercurial/ui.py Sun Nov 06 20:16:54 2016 +0100 +++ b/mercurial/ui.py Tue Feb 28 11:13:25 2017 -0800 @@ -70,9 +70,9 @@ # path aliases to other clones of this repo in URLs or filesystem paths # (see 'hg help config.paths' for more info) # -# default-push = ssh://jdoe@example.net/hg/jdoes-fork -# my-fork = ssh://jdoe@example.net/hg/jdoes-fork -# my-clone = /home/jdoe/jdoes-clone +# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork +# my-fork = ssh://jdoe@example.net/hg/jdoes-fork +# my-clone = /home/jdoe/jdoes-clone [ui] # name and email (local to this repository, optional), e.g. @@ -85,10 +85,10 @@ # path aliases to other clones of this repo in URLs or filesystem paths # (see 'hg help config.paths' for more info) # -# default = http://example.com/hg/example-repo -# default-push = ssh://jdoe@example.net/hg/jdoes-fork -# my-fork = ssh://jdoe@example.net/hg/jdoes-fork -# my-clone = /home/jdoe/jdoes-clone +# default = http://example.com/hg/example-repo +# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork +# my-fork = ssh://jdoe@example.net/hg/jdoes-fork +# my-clone = /home/jdoe/jdoes-clone [ui] # name and email (local to this repository, optional), e.g.