Show More
@@ -2280,7 +2280,7 b' def update(ctx, updatecheck=None, wc=Non' | |||
|
2280 | 2280 | ctx.rev(), |
|
2281 | 2281 | branchmerge=False, |
|
2282 | 2282 | force=False, |
|
2283 | labels=[b'working copy', b'destination'], | |
|
2283 | labels=[b'working copy', b'destination', b'working copy parent'], | |
|
2284 | 2284 | updatecheck=updatecheck, |
|
2285 | 2285 | wc=wc, |
|
2286 | 2286 | ) |
@@ -308,7 +308,7 b' internal:mergediff' | |||
|
308 | 308 | 2 |
|
309 | 309 | 3 |
|
310 | 310 | <<<<<<< |
|
311 | ------- base | |
|
311 | ------- working copy parent | |
|
312 | 312 | +++++++ working copy |
|
313 | 313 | 4 |
|
314 | 314 | +4.5 |
@@ -346,7 +346,7 b' copy in full and the diff from base to d' | |||
|
346 | 346 | 3.5 |
|
347 | 347 | 4.5 |
|
348 | 348 | 5.5 |
|
349 | ------- base | |
|
349 | ------- working copy parent | |
|
350 | 350 | +++++++ destination |
|
351 | 351 | 3 |
|
352 | 352 | -4 |
@@ -292,14 +292,14 b' Cases are run as shown in that table, ro' | |||
|
292 | 292 | # To mark files as resolved: hg resolve --mark FILE |
|
293 | 293 | |
|
294 | 294 | $ cat a |
|
295 | <<<<<<< working copy: 6efa171f091b - test: 3 | |
|
295 | <<<<<<< working copy: 6efa171f091b - test: 3 | |
|
296 | 296 | three |
|
297 | 297 | dirty |
|
298 |
||||||| |
|
|
298 | ||||||| working copy parent: 6efa171f091b - test: 3 | |
|
299 | 299 | three |
|
300 | 300 | ======= |
|
301 | 301 | four |
|
302 | >>>>>>> destination: d047485b3896 b1 - test: 4 | |
|
302 | >>>>>>> destination: d047485b3896 b1 - test: 4 | |
|
303 | 303 | $ rm a.orig |
|
304 | 304 | |
|
305 | 305 | $ echo 'update.check = noconflict' >> .hg/hgrc |
General Comments 0
You need to be logged in to leave comments.
Login now