comparison tests/test-revset-outgoing.t @ 31119:13bbcd56c57a

merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Feb 2017 11:13:25 -0800
parents 4431add9aef9
children 4441705b7111
comparison
equal deleted inserted replaced
31116:6483e49204ee 31119:13bbcd56c57a
41 default = $TESTTMP/a#stable (glob) 41 default = $TESTTMP/a#stable (glob)
42 42
43 # path aliases to other clones of this repo in URLs or filesystem paths 43 # path aliases to other clones of this repo in URLs or filesystem paths
44 # (see 'hg help config.paths' for more info) 44 # (see 'hg help config.paths' for more info)
45 # 45 #
46 # default-push = ssh://jdoe@example.net/hg/jdoes-fork 46 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
47 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork 47 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
48 # my-clone = /home/jdoe/jdoes-clone 48 # my-clone = /home/jdoe/jdoes-clone
49 49
50 [ui] 50 [ui]
51 # name and email (local to this repository, optional), e.g. 51 # name and email (local to this repository, optional), e.g.
52 # username = Jane Doe <jdoe@example.com> 52 # username = Jane Doe <jdoe@example.com>
53 53
93 default = $TESTTMP/a#stable (glob) 93 default = $TESTTMP/a#stable (glob)
94 94
95 # path aliases to other clones of this repo in URLs or filesystem paths 95 # path aliases to other clones of this repo in URLs or filesystem paths
96 # (see 'hg help config.paths' for more info) 96 # (see 'hg help config.paths' for more info)
97 # 97 #
98 # default-push = ssh://jdoe@example.net/hg/jdoes-fork 98 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
99 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork 99 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
100 # my-clone = /home/jdoe/jdoes-clone 100 # my-clone = /home/jdoe/jdoes-clone
101 101
102 [ui] 102 [ui]
103 # name and email (local to this repository, optional), e.g. 103 # name and email (local to this repository, optional), e.g.
104 # username = Jane Doe <jdoe@example.com> 104 # username = Jane Doe <jdoe@example.com>
105 green = ../a#default 105 green = ../a#default