##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Update test output
Matt Mackall -
r3281:f49c90b4 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -302,7 +302,7 b' M b'
302 --------------
302 --------------
303
303
304 --------------
304 --------------
305 test L:nc a b R:up a b W: - 16 merge a, merge b no ancestor
305 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
306 --------------
306 --------------
307 resolving manifests
307 resolving manifests
308 overwrite None branchmerge True partial False
308 overwrite None branchmerge True partial False
@@ -325,7 +325,7 b' M b'
325 --------------
325 --------------
326
326
327 --------------
327 --------------
328 test L:up a b R:nc a b W: - 17 merge a, merge b no ancestor
328 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
329 --------------
329 --------------
330 resolving manifests
330 resolving manifests
331 overwrite None branchmerge True partial False
331 overwrite None branchmerge True partial False
@@ -369,7 +369,7 b' M b'
369 --------------
369 --------------
370
370
371 --------------
371 --------------
372 test L:up a b R:nm a b W: - 19 merge b no ancestor, remove a
372 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
373 --------------
373 --------------
374 resolving manifests
374 resolving manifests
375 overwrite None branchmerge True partial False
375 overwrite None branchmerge True partial False
General Comments 0
You need to be logged in to leave comments. Login now