Mercurial > hg
comparison tests/test-merge-force.t @ 30062:940c05b25b07
merge: add conflict labels to merge command
Now that we present the conflict labels in prompts, it's useful to have
better names than "local" and "other" for every command.
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Fri, 07 Oct 2016 08:51:50 -0700 |
| parents | 978b907d9b36 |
| children | ce3a133f71b3 |
comparison
equal
deleted
inserted
replaced
| 30061:8e805cf27caa | 30062:940c05b25b07 |
|---|---|
| 140 # Notes: | 140 # Notes: |
| 141 # - local and remote changed content1_content2_*_content2-untracked | 141 # - local and remote changed content1_content2_*_content2-untracked |
| 142 # in the same way, so it could potentially be left alone | 142 # in the same way, so it could potentially be left alone |
| 143 | 143 |
| 144 $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 | 144 $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 |
| 145 local changed content1_missing_content1_content4-tracked which other deleted | 145 local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted |
| 146 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 146 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 147 local changed content1_missing_content3_content3-tracked which other deleted | 147 local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted |
| 148 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 148 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 149 local changed content1_missing_content3_content4-tracked which other deleted | 149 local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted |
| 150 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 150 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 151 local changed content1_missing_missing_content4-tracked which other deleted | 151 local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted |
| 152 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 152 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 153 other changed content1_content2_content1_content1-untracked which local deleted | 153 other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted |
| 154 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 154 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 155 other changed content1_content2_content1_content2-untracked which local deleted | 155 other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted |
| 156 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 156 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 157 other changed content1_content2_content1_content4-untracked which local deleted | 157 other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted |
| 158 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 158 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 159 other changed content1_content2_content1_missing-tracked which local deleted | 159 other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted |
| 160 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 160 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 161 other changed content1_content2_content1_missing-untracked which local deleted | 161 other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted |
| 162 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 162 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 163 other changed content1_content2_content2_content1-untracked which local deleted | 163 other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted |
| 164 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 164 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 165 other changed content1_content2_content2_content2-untracked which local deleted | 165 other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted |
| 166 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 166 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 167 other changed content1_content2_content2_content4-untracked which local deleted | 167 other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted |
| 168 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 168 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 169 other changed content1_content2_content2_missing-tracked which local deleted | 169 other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted |
| 170 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 170 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 171 other changed content1_content2_content2_missing-untracked which local deleted | 171 other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted |
| 172 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 172 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 173 other changed content1_content2_content3_content1-untracked which local deleted | 173 other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted |
| 174 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 174 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 175 other changed content1_content2_content3_content2-untracked which local deleted | 175 other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted |
| 176 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 176 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 177 other changed content1_content2_content3_content3-untracked which local deleted | 177 other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted |
| 178 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 178 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 179 other changed content1_content2_content3_content4-untracked which local deleted | 179 other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted |
| 180 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 180 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 181 other changed content1_content2_content3_missing-tracked which local deleted | 181 other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted |
| 182 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 182 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 183 other changed content1_content2_content3_missing-untracked which local deleted | 183 other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted |
| 184 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 184 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 185 other changed content1_content2_missing_content1-untracked which local deleted | 185 other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted |
| 186 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 186 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 187 other changed content1_content2_missing_content2-untracked which local deleted | 187 other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted |
| 188 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 188 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 189 other changed content1_content2_missing_content4-untracked which local deleted | 189 other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted |
| 190 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 190 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 191 other changed content1_content2_missing_missing-tracked which local deleted | 191 other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted |
| 192 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 192 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 193 other changed content1_content2_missing_missing-untracked which local deleted | 193 other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted |
| 194 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 194 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 195 merging content1_content2_content1_content4-tracked | 195 merging content1_content2_content1_content4-tracked |
| 196 merging content1_content2_content2_content1-tracked | 196 merging content1_content2_content2_content1-tracked |
| 197 merging content1_content2_content2_content4-tracked | 197 merging content1_content2_content2_content4-tracked |
| 198 merging content1_content2_content3_content1-tracked | 198 merging content1_content2_content3_content1-tracked |
| 371 | 371 |
| 372 M content1_content2_content1_content2-untracked | 372 M content1_content2_content1_content2-untracked |
| 373 content2 | 373 content2 |
| 374 | 374 |
| 375 M content1_content2_content1_content4-tracked | 375 M content1_content2_content1_content4-tracked |
| 376 <<<<<<< local: 0447570f1af6 - test: local | 376 <<<<<<< working copy: 0447570f1af6 - test: local |
| 377 content4 | 377 content4 |
| 378 ||||||| base | 378 ||||||| base |
| 379 content1 | 379 content1 |
| 380 ======= | 380 ======= |
| 381 content2 | 381 content2 |
| 382 >>>>>>> other: 85100b8c675b - test: remote | 382 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 383 | 383 |
| 384 M content1_content2_content1_content4-untracked | 384 M content1_content2_content1_content4-untracked |
| 385 content2 | 385 content2 |
| 386 | 386 |
| 387 M content1_content2_content1_missing-tracked | 387 M content1_content2_content1_missing-tracked |
| 401 | 401 |
| 402 M content1_content2_content2_content2-untracked | 402 M content1_content2_content2_content2-untracked |
| 403 content2 | 403 content2 |
| 404 | 404 |
| 405 M content1_content2_content2_content4-tracked | 405 M content1_content2_content2_content4-tracked |
| 406 <<<<<<< local: 0447570f1af6 - test: local | 406 <<<<<<< working copy: 0447570f1af6 - test: local |
| 407 content4 | 407 content4 |
| 408 ||||||| base | 408 ||||||| base |
| 409 content1 | 409 content1 |
| 410 ======= | 410 ======= |
| 411 content2 | 411 content2 |
| 412 >>>>>>> other: 85100b8c675b - test: remote | 412 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 413 | 413 |
| 414 M content1_content2_content2_content4-untracked | 414 M content1_content2_content2_content4-untracked |
| 415 content2 | 415 content2 |
| 416 | 416 |
| 417 M content1_content2_content2_missing-tracked | 417 M content1_content2_content2_missing-tracked |
| 431 | 431 |
| 432 M content1_content2_content3_content2-untracked | 432 M content1_content2_content3_content2-untracked |
| 433 content2 | 433 content2 |
| 434 | 434 |
| 435 M content1_content2_content3_content3-tracked | 435 M content1_content2_content3_content3-tracked |
| 436 <<<<<<< local: 0447570f1af6 - test: local | 436 <<<<<<< working copy: 0447570f1af6 - test: local |
| 437 content3 | 437 content3 |
| 438 ||||||| base | 438 ||||||| base |
| 439 content1 | 439 content1 |
| 440 ======= | 440 ======= |
| 441 content2 | 441 content2 |
| 442 >>>>>>> other: 85100b8c675b - test: remote | 442 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 443 | 443 |
| 444 M content1_content2_content3_content3-untracked | 444 M content1_content2_content3_content3-untracked |
| 445 content2 | 445 content2 |
| 446 | 446 |
| 447 M content1_content2_content3_content4-tracked | 447 M content1_content2_content3_content4-tracked |
| 448 <<<<<<< local: 0447570f1af6 - test: local | 448 <<<<<<< working copy: 0447570f1af6 - test: local |
| 449 content4 | 449 content4 |
| 450 ||||||| base | 450 ||||||| base |
| 451 content1 | 451 content1 |
| 452 ======= | 452 ======= |
| 453 content2 | 453 content2 |
| 454 >>>>>>> other: 85100b8c675b - test: remote | 454 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 455 | 455 |
| 456 M content1_content2_content3_content4-untracked | 456 M content1_content2_content3_content4-untracked |
| 457 content2 | 457 content2 |
| 458 | 458 |
| 459 M content1_content2_content3_missing-tracked | 459 M content1_content2_content3_missing-tracked |
| 473 | 473 |
| 474 M content1_content2_missing_content2-untracked | 474 M content1_content2_missing_content2-untracked |
| 475 content2 | 475 content2 |
| 476 | 476 |
| 477 M content1_content2_missing_content4-tracked | 477 M content1_content2_missing_content4-tracked |
| 478 <<<<<<< local: 0447570f1af6 - test: local | 478 <<<<<<< working copy: 0447570f1af6 - test: local |
| 479 content4 | 479 content4 |
| 480 ||||||| base | 480 ||||||| base |
| 481 content1 | 481 content1 |
| 482 ======= | 482 ======= |
| 483 content2 | 483 content2 |
| 484 >>>>>>> other: 85100b8c675b - test: remote | 484 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 485 | 485 |
| 486 M content1_content2_missing_content4-untracked | 486 M content1_content2_missing_content4-untracked |
| 487 content2 | 487 content2 |
| 488 | 488 |
| 489 M content1_content2_missing_missing-tracked | 489 M content1_content2_missing_missing-tracked |
| 557 | 557 |
| 558 M missing_content2_content2_content2-untracked | 558 M missing_content2_content2_content2-untracked |
| 559 content2 | 559 content2 |
| 560 | 560 |
| 561 M missing_content2_content2_content4-tracked | 561 M missing_content2_content2_content4-tracked |
| 562 <<<<<<< local: 0447570f1af6 - test: local | 562 <<<<<<< working copy: 0447570f1af6 - test: local |
| 563 content4 | 563 content4 |
| 564 ||||||| base | 564 ||||||| base |
| 565 ======= | 565 ======= |
| 566 content2 | 566 content2 |
| 567 >>>>>>> other: 85100b8c675b - test: remote | 567 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 568 | 568 |
| 569 M missing_content2_content2_content4-untracked | 569 M missing_content2_content2_content4-untracked |
| 570 content2 | 570 content2 |
| 571 | 571 |
| 572 M missing_content2_content2_missing-tracked | 572 M missing_content2_content2_missing-tracked |
| 580 | 580 |
| 581 M missing_content2_content3_content2-untracked | 581 M missing_content2_content3_content2-untracked |
| 582 content2 | 582 content2 |
| 583 | 583 |
| 584 M missing_content2_content3_content3-tracked | 584 M missing_content2_content3_content3-tracked |
| 585 <<<<<<< local: 0447570f1af6 - test: local | 585 <<<<<<< working copy: 0447570f1af6 - test: local |
| 586 content3 | 586 content3 |
| 587 ||||||| base | 587 ||||||| base |
| 588 ======= | 588 ======= |
| 589 content2 | 589 content2 |
| 590 >>>>>>> other: 85100b8c675b - test: remote | 590 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 591 | 591 |
| 592 M missing_content2_content3_content3-untracked | 592 M missing_content2_content3_content3-untracked |
| 593 content2 | 593 content2 |
| 594 | 594 |
| 595 M missing_content2_content3_content4-tracked | 595 M missing_content2_content3_content4-tracked |
| 596 <<<<<<< local: 0447570f1af6 - test: local | 596 <<<<<<< working copy: 0447570f1af6 - test: local |
| 597 content4 | 597 content4 |
| 598 ||||||| base | 598 ||||||| base |
| 599 ======= | 599 ======= |
| 600 content2 | 600 content2 |
| 601 >>>>>>> other: 85100b8c675b - test: remote | 601 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 602 | 602 |
| 603 M missing_content2_content3_content4-untracked | 603 M missing_content2_content3_content4-untracked |
| 604 content2 | 604 content2 |
| 605 | 605 |
| 606 M missing_content2_content3_missing-tracked | 606 M missing_content2_content3_missing-tracked |
| 614 | 614 |
| 615 M missing_content2_missing_content2-untracked | 615 M missing_content2_missing_content2-untracked |
| 616 content2 | 616 content2 |
| 617 | 617 |
| 618 M missing_content2_missing_content4-tracked | 618 M missing_content2_missing_content4-tracked |
| 619 <<<<<<< local: 0447570f1af6 - test: local | 619 <<<<<<< working copy: 0447570f1af6 - test: local |
| 620 content4 | 620 content4 |
| 621 ||||||| base | 621 ||||||| base |
| 622 ======= | 622 ======= |
| 623 content2 | 623 content2 |
| 624 >>>>>>> other: 85100b8c675b - test: remote | 624 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 625 | 625 |
| 626 M missing_content2_missing_content4-untracked | 626 M missing_content2_missing_content4-untracked |
| 627 <<<<<<< local: 0447570f1af6 - test: local | 627 <<<<<<< working copy: 0447570f1af6 - test: local |
| 628 content4 | 628 content4 |
| 629 ||||||| base | 629 ||||||| base |
| 630 ======= | 630 ======= |
| 631 content2 | 631 content2 |
| 632 >>>>>>> other: 85100b8c675b - test: remote | 632 >>>>>>> merge rev: 85100b8c675b - test: remote |
| 633 | 633 |
| 634 M missing_content2_missing_missing-tracked | 634 M missing_content2_missing_missing-tracked |
| 635 content2 | 635 content2 |
| 636 | 636 |
| 637 M missing_content2_missing_missing-untracked | 637 M missing_content2_missing_missing-untracked |
| 701 $ hg resolve --unmark --all | 701 $ hg resolve --unmark --all |
| 702 $ hg resolve --all --tool :local | 702 $ hg resolve --all --tool :local |
| 703 (no more unresolved files) | 703 (no more unresolved files) |
| 704 $ hg resolve --unmark --all | 704 $ hg resolve --unmark --all |
| 705 $ hg resolve --all --tool internal:merge3 | 705 $ hg resolve --all --tool internal:merge3 |
| 706 other changed content1_content2_content1_content1-untracked which local deleted | 706 other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted |
| 707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 708 other changed content1_content2_content1_content2-untracked which local deleted | 708 other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted |
| 709 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 709 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 710 merging content1_content2_content1_content4-tracked | 710 merging content1_content2_content1_content4-tracked |
| 711 other changed content1_content2_content1_content4-untracked which local deleted | 711 other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted |
| 712 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 712 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 713 other changed content1_content2_content1_missing-tracked which local deleted | 713 other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted |
| 714 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 714 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 715 other changed content1_content2_content1_missing-untracked which local deleted | 715 other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted |
| 716 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 716 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 717 merging content1_content2_content2_content1-tracked | 717 merging content1_content2_content2_content1-tracked |
| 718 other changed content1_content2_content2_content1-untracked which local deleted | 718 other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted |
| 719 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 719 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 720 other changed content1_content2_content2_content2-untracked which local deleted | 720 other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted |
| 721 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 721 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 722 merging content1_content2_content2_content4-tracked | 722 merging content1_content2_content2_content4-tracked |
| 723 other changed content1_content2_content2_content4-untracked which local deleted | 723 other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted |
| 724 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 724 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 725 other changed content1_content2_content2_missing-tracked which local deleted | 725 other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted |
| 726 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 726 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 727 other changed content1_content2_content2_missing-untracked which local deleted | 727 other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted |
| 728 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 728 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 729 merging content1_content2_content3_content1-tracked | 729 merging content1_content2_content3_content1-tracked |
| 730 other changed content1_content2_content3_content1-untracked which local deleted | 730 other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted |
| 731 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 731 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 732 other changed content1_content2_content3_content2-untracked which local deleted | 732 other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted |
| 733 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 733 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 734 merging content1_content2_content3_content3-tracked | 734 merging content1_content2_content3_content3-tracked |
| 735 other changed content1_content2_content3_content3-untracked which local deleted | 735 other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted |
| 736 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 736 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 737 merging content1_content2_content3_content4-tracked | 737 merging content1_content2_content3_content4-tracked |
| 738 other changed content1_content2_content3_content4-untracked which local deleted | 738 other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted |
| 739 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 739 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 740 other changed content1_content2_content3_missing-tracked which local deleted | 740 other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted |
| 741 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 741 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 742 other changed content1_content2_content3_missing-untracked which local deleted | 742 other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted |
| 743 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 743 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 744 merging content1_content2_missing_content1-tracked | 744 merging content1_content2_missing_content1-tracked |
| 745 other changed content1_content2_missing_content1-untracked which local deleted | 745 other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted |
| 746 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 746 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 747 other changed content1_content2_missing_content2-untracked which local deleted | 747 other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted |
| 748 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 748 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 749 merging content1_content2_missing_content4-tracked | 749 merging content1_content2_missing_content4-tracked |
| 750 other changed content1_content2_missing_content4-untracked which local deleted | 750 other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted |
| 751 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 751 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 752 other changed content1_content2_missing_missing-tracked which local deleted | 752 other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted |
| 753 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 753 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 754 other changed content1_content2_missing_missing-untracked which local deleted | 754 other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted |
| 755 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 755 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 756 local changed content1_missing_content1_content4-tracked which other deleted | 756 local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted |
| 757 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 757 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 758 local changed content1_missing_content3_content3-tracked which other deleted | 758 local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted |
| 759 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 759 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 760 local changed content1_missing_content3_content4-tracked which other deleted | 760 local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted |
| 761 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 761 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 762 local changed content1_missing_missing_content4-tracked which other deleted | 762 local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted |
| 763 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 763 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 764 merging missing_content2_content2_content4-tracked | 764 merging missing_content2_content2_content4-tracked |
| 765 merging missing_content2_content3_content3-tracked | 765 merging missing_content2_content3_content3-tracked |
| 766 merging missing_content2_content3_content4-tracked | 766 merging missing_content2_content3_content4-tracked |
| 767 merging missing_content2_missing_content4-tracked | 767 merging missing_content2_missing_content4-tracked |