@@ -214,7 +214,7 @@ Test conflicted merge state
214
214
#
215
215
# To mark files as resolved: hg resolve --mark FILE
216
216
# To continue: hg commit
217
- # To abort: hg goto --clean . (warning: this will discard uncommitted changes)
217
+ # To abort: hg goto . --clean (warning: this will discard uncommitted changes)
218
218
219
219
220
220
Test if listed files have a relative path to current location
@@ -231,7 +231,7 @@ Test if listed files have a relative path to current location
231
231
#
232
232
# To mark files as resolved: hg resolve --mark FILE
233
233
# To continue: hg commit
234
- # To abort: hg goto --clean . (warning: this will discard uncommitted changes)
234
+ # To abort: hg goto . --clean (warning: this will discard uncommitted changes)
235
235
236
236
$ cd .. / ..
237
237
@@ -252,7 +252,7 @@ Test non-conflicted merge state
252
252
253
253
# The repository is in an unfinished *merge* state.
254
254
# To continue: hg commit
255
- # To abort: hg goto --clean . (warning: this will discard uncommitted changes)
255
+ # To abort: hg goto . --clean (warning: this will discard uncommitted changes)
256
256
257
257
258
258
Test hg status is normal after merge commit (no output)
@@ -266,7 +266,7 @@ Test interrupted update state, without active bookmark and REV is a hash
266
266
267
267
# The repository is in an unfinished *update* state.
268
268
# To continue: hg goto -C 2977a57ce863
269
- # To abort: hg goto --clean . (warning: this will discard uncommitted changes)
269
+ # To abort: hg goto . --clean (warning: this will discard uncommitted changes)
270
270
271
271
272
272
Test interrupted update state , with active bookmark and REV is a bookmark
@@ -277,7 +277,7 @@ Test interrupted update state, with active bookmark and REV is a bookmark
277
277
278
278
# The repository is in an unfinished *update* state.
279
279
# To continue: hg goto b2
280
- # To abort: hg goto --clean b1 (warning: this will discard uncommitted changes)
280
+ # To abort: hg goto b1 --clean (warning: this will discard uncommitted changes)
281
281
282
282
283
283
Test update state can be reset using bookmark
@@ -293,7 +293,7 @@ Test interrupted update state, without active bookmark and REV is specified usin
293
293
294
294
# The repository is in an unfinished *update* state.
295
295
# To continue: hg goto --date 1970-1-1 -q
296
- # To abort: hg goto --clean . (warning: this will discard uncommitted changes)
296
+ # To abort: hg goto . --clean (warning: this will discard uncommitted changes)
297
297
298
298
299
299
$ unbreakupdate
@@ -310,7 +310,7 @@ Test args escaping in continue command
310
310
311
311
# The repository is in an unfinished *update* state.
312
312
# To continue: hg --config 'extensions.fsmonitor=!' --config 'ui.ssh=ssh -oControlMaster=no' update -C 2977a57ce863
313
- # To abort: hg goto --clean b1 (warning: this will discard uncommitted changes)
313
+ # To abort: hg goto b1 --clean (warning: this will discard uncommitted changes)
314
314
315
315
316
316
$ unbreakupdate
0 commit comments