equal
deleted
inserted
replaced
302 false.whatever= |
302 false.whatever= |
303 true.priority=1 |
303 true.priority=1 |
304 true.executable=cat |
304 true.executable=cat |
305 # hg update -C 1 |
305 # hg update -C 1 |
306 # hg merge -r 2 --config ui.merge=internal:prompt |
306 # hg merge -r 2 --config ui.merge=internal:prompt |
|
307 no tool found to merge f |
|
308 keep (l)ocal or take (o)ther? l |
307 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
309 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
308 (branch merge, don't forget to commit) |
310 (branch merge, don't forget to commit) |
309 # cat f |
311 # cat f |
310 revision 1 |
312 revision 1 |
311 space |
313 space |
510 revision 0 |
512 revision 0 |
511 space |
513 space |
512 revision 2 |
514 revision 2 |
513 space |
515 space |
514 merging f |
516 merging f |
515 merging f failed! |
517 output file f appears unchanged |
516 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
518 was merge successful (yn)? n |
517 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
519 merging f failed! |
518 # cat f |
520 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
519 revision 1 |
521 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
520 space |
522 # cat f |
521 # hg stat |
523 revision 1 |
522 M f |
524 space |
523 ? f.orig |
525 # hg stat |
524 |
526 M f |
|
527 ? f.orig |
|
528 |