equal
deleted
inserted
replaced
128 | |
128 | |
129 o 055a42cdd887(default) |
129 o 055a42cdd887(default) |
130 |
130 |
131 $ HGEDITOR=cat hg -q histedit --outgoing '../r' |
131 $ HGEDITOR=cat hg -q histedit --outgoing '../r' |
132 abort: there are ambiguous outgoing revisions |
132 abort: there are ambiguous outgoing revisions |
133 (see "hg help histedit" for more detail) |
133 (see 'hg help histedit' for more detail) |
134 [255] |
134 [255] |
135 |
135 |
136 $ hg -q update -C 2 |
136 $ hg -q update -C 2 |
137 $ echo aa >> a |
137 $ echo aa >> a |
138 $ hg -q commit -m 'another head on default' |
138 $ hg -q commit -m 'another head on default' |
145 | |
145 | |
146 o 055a42cdd887(default) |
146 o 055a42cdd887(default) |
147 |
147 |
148 $ HGEDITOR=cat hg -q histedit --outgoing '../r#default' |
148 $ HGEDITOR=cat hg -q histedit --outgoing '../r#default' |
149 abort: there are ambiguous outgoing revisions |
149 abort: there are ambiguous outgoing revisions |
150 (see "hg help histedit" for more detail) |
150 (see 'hg help histedit' for more detail) |
151 [255] |
151 [255] |
152 |
152 |
153 $ cd .. |
153 $ cd .. |