Mercurial > hg
comparison tests/test-merge-changedelete.t @ 39285:a3fd84f4fb38
filemerge: fix the wrong placements of messages in prompt
Mistakenly, the local-changed-other-deleted-message was put in
other-change-local-deleted and vice versa. This followups on D4336.
Thanks to Yuya who spotted this.
Differential Revision: https://phab.mercurial-scm.org/D4375
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Sun, 26 Aug 2018 19:14:26 +0300 |
| parents | 975d959295ef |
| children | 4764e8436b2a |
comparison
equal
deleted
inserted
replaced
| 39284:975d959295ef | 39285:a3fd84f4fb38 |
|---|---|
| 52 | 52 |
| 53 | 53 |
| 54 Non-interactive merge: | 54 Non-interactive merge: |
| 55 | 55 |
| 56 $ hg merge -y | 56 $ hg merge -y |
| 57 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 57 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 58 What do you want to do? | 58 What do you want to do? |
| 59 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 59 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 60 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 60 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 61 What do you want to do? | 61 What do you want to do? |
| 62 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 62 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 63 merging file3 | 63 merging file3 |
| 64 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | 64 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
| 65 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | 65 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
| 121 | 121 |
| 122 $ hg merge --config ui.interactive=true <<EOF | 122 $ hg merge --config ui.interactive=true <<EOF |
| 123 > c | 123 > c |
| 124 > d | 124 > d |
| 125 > EOF | 125 > EOF |
| 126 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 126 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 127 What do you want to do? | 127 What do you want to do? |
| 128 use (c)hanged version, (d)elete, or leave (u)nresolved? c | 128 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
| 129 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 129 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 130 What do you want to do? | 130 What do you want to do? |
| 131 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d | 131 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
| 132 merging file3 | 132 merging file3 |
| 133 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | 133 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
| 134 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | 134 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
| 191 > bar | 191 > bar |
| 192 > d | 192 > d |
| 193 > baz | 193 > baz |
| 194 > c | 194 > c |
| 195 > EOF | 195 > EOF |
| 196 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 196 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 197 What do you want to do? | 197 What do you want to do? |
| 198 use (c)hanged version, (d)elete, or leave (u)nresolved? foo | 198 use (c)hanged version, (d)elete, or leave (u)nresolved? foo |
| 199 unrecognized response | 199 unrecognized response |
| 200 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 200 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 201 What do you want to do? | 201 What do you want to do? |
| 202 use (c)hanged version, (d)elete, or leave (u)nresolved? bar | 202 use (c)hanged version, (d)elete, or leave (u)nresolved? bar |
| 203 unrecognized response | 203 unrecognized response |
| 204 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 204 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 205 What do you want to do? | 205 What do you want to do? |
| 206 use (c)hanged version, (d)elete, or leave (u)nresolved? d | 206 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
| 207 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 207 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 208 What do you want to do? | 208 What do you want to do? |
| 209 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz | 209 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz |
| 210 unrecognized response | 210 unrecognized response |
| 211 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 211 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 212 What do you want to do? | 212 What do you want to do? |
| 213 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | 213 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
| 214 merging file3 | 214 merging file3 |
| 215 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | 215 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
| 216 0 files updated, 1 files merged, 1 files removed, 1 files unresolved | 216 0 files updated, 1 files merged, 1 files removed, 1 files unresolved |
| 269 1 other heads for branch "default" | 269 1 other heads for branch "default" |
| 270 | 270 |
| 271 $ hg merge --config ui.interactive=true <<EOF | 271 $ hg merge --config ui.interactive=true <<EOF |
| 272 > d | 272 > d |
| 273 > EOF | 273 > EOF |
| 274 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 274 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 275 What do you want to do? | 275 What do you want to do? |
| 276 use (c)hanged version, (d)elete, or leave (u)nresolved? d | 276 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
| 277 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 277 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 278 What do you want to do? | 278 What do you want to do? |
| 279 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 279 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 280 merging file3 | 280 merging file3 |
| 281 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | 281 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
| 282 0 files updated, 0 files merged, 1 files removed, 2 files unresolved | 282 0 files updated, 0 files merged, 1 files removed, 2 files unresolved |
| 482 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 482 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 483 updated to "13910f48cf7b: changed file1, removed file2, changed file3" | 483 updated to "13910f48cf7b: changed file1, removed file2, changed file3" |
| 484 1 other heads for branch "default" | 484 1 other heads for branch "default" |
| 485 | 485 |
| 486 $ hg merge --config ui.interactive=True --tool :prompt | 486 $ hg merge --config ui.interactive=True --tool :prompt |
| 487 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 487 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 488 What do you want to do? | 488 What do you want to do? |
| 489 use (c)hanged version, (d)elete, or leave (u)nresolved? | 489 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 490 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 490 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 491 What do you want to do? | 491 What do you want to do? |
| 492 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 492 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 493 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | 493 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? |
| 494 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | 494 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
| 495 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 495 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
| 543 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 543 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 544 updated to "13910f48cf7b: changed file1, removed file2, changed file3" | 544 updated to "13910f48cf7b: changed file1, removed file2, changed file3" |
| 545 1 other heads for branch "default" | 545 1 other heads for branch "default" |
| 546 | 546 |
| 547 $ hg merge --tool :prompt | 547 $ hg merge --tool :prompt |
| 548 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 548 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 549 What do you want to do? | 549 What do you want to do? |
| 550 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 550 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 551 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 551 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 552 What do you want to do? | 552 What do you want to do? |
| 553 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 553 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 554 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u | 554 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u |
| 555 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | 555 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
| 556 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 556 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
| 602 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 602 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 603 updated to "13910f48cf7b: changed file1, removed file2, changed file3" | 603 updated to "13910f48cf7b: changed file1, removed file2, changed file3" |
| 604 1 other heads for branch "default" | 604 1 other heads for branch "default" |
| 605 | 605 |
| 606 $ hg merge --tool :merge3 | 606 $ hg merge --tool :merge3 |
| 607 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 607 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 608 What do you want to do? | 608 What do you want to do? |
| 609 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 609 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 610 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 610 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 611 What do you want to do? | 611 What do you want to do? |
| 612 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 612 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 613 merging file3 | 613 merging file3 |
| 614 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | 614 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
| 615 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | 615 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
| 694 (no more unresolved files) | 694 (no more unresolved files) |
| 695 --- diff of status --- | 695 --- diff of status --- |
| 696 (status identical) | 696 (status identical) |
| 697 | 697 |
| 698 === :other -> :prompt === | 698 === :other -> :prompt === |
| 699 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 699 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 700 What do you want to do? | 700 What do you want to do? |
| 701 use (c)hanged version, (d)elete, or leave (u)nresolved? | 701 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 702 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 702 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 703 What do you want to do? | 703 What do you want to do? |
| 704 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 704 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 705 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | 705 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? |
| 706 --- diff of status --- | 706 --- diff of status --- |
| 707 (status identical) | 707 (status identical) |
| 724 (no more unresolved files) | 724 (no more unresolved files) |
| 725 --- diff of status --- | 725 --- diff of status --- |
| 726 (status identical) | 726 (status identical) |
| 727 | 727 |
| 728 === :local -> :prompt === | 728 === :local -> :prompt === |
| 729 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 729 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 730 What do you want to do? | 730 What do you want to do? |
| 731 use (c)hanged version, (d)elete, or leave (u)nresolved? | 731 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 732 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 732 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 733 What do you want to do? | 733 What do you want to do? |
| 734 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 734 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 735 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | 735 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? |
| 736 --- diff of status --- | 736 --- diff of status --- |
| 737 (status identical) | 737 (status identical) |
| 744 === :other -> :fail === | 744 === :other -> :fail === |
| 745 --- diff of status --- | 745 --- diff of status --- |
| 746 (status identical) | 746 (status identical) |
| 747 | 747 |
| 748 === :fail -> :prompt === | 748 === :fail -> :prompt === |
| 749 file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | 749 file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
| 750 What do you want to do? | 750 What do you want to do? |
| 751 use (c)hanged version, (d)elete, or leave (u)nresolved? | 751 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 752 file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. | 752 file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
| 753 What do you want to do? | 753 What do you want to do? |
| 754 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 754 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 755 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | 755 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? |
| 756 --- diff of status --- | 756 --- diff of status --- |
| 757 (status identical) | 757 (status identical) |
| 772 $ hg co -C 0 | 772 $ hg co -C 0 |
| 773 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 773 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 774 $ echo changed >> file1 | 774 $ echo changed >> file1 |
| 775 $ hg rm file2 | 775 $ hg rm file2 |
| 776 $ hg update 1 -y | 776 $ hg update 1 -y |
| 777 file 'file1' was deleted in local [working copy] but was modified in other [destination]. | 777 file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
| 778 What do you want to do? | 778 What do you want to do? |
| 779 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 779 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 780 file 'file2' was deleted in other [destination] but was modified in local [working copy]. | 780 file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
| 781 What do you want to do? | 781 What do you want to do? |
| 782 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 782 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 783 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | 783 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
| 784 use 'hg resolve' to retry unresolved file merges | 784 use 'hg resolve' to retry unresolved file merges |
| 785 [1] | 785 [1] |
| 950 $ hg co -C 0 | 950 $ hg co -C 0 |
| 951 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 951 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 952 $ echo changed >> file1 | 952 $ echo changed >> file1 |
| 953 $ hg rm file2 | 953 $ hg rm file2 |
| 954 $ hg update 1 --config ui.interactive=True --tool :prompt | 954 $ hg update 1 --config ui.interactive=True --tool :prompt |
| 955 file 'file1' was deleted in local [working copy] but was modified in other [destination]. | 955 file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
| 956 What do you want to do? | 956 What do you want to do? |
| 957 use (c)hanged version, (d)elete, or leave (u)nresolved? | 957 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 958 file 'file2' was deleted in other [destination] but was modified in local [working copy]. | 958 file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
| 959 What do you want to do? | 959 What do you want to do? |
| 960 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 960 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 961 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | 961 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
| 962 use 'hg resolve' to retry unresolved file merges | 962 use 'hg resolve' to retry unresolved file merges |
| 963 [1] | 963 [1] |
| 1002 $ hg co -C 0 | 1002 $ hg co -C 0 |
| 1003 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1003 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1004 $ echo changed >> file1 | 1004 $ echo changed >> file1 |
| 1005 $ hg rm file2 | 1005 $ hg rm file2 |
| 1006 $ hg update 1 --tool :merge3 | 1006 $ hg update 1 --tool :merge3 |
| 1007 file 'file1' was deleted in local [working copy] but was modified in other [destination]. | 1007 file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
| 1008 What do you want to do? | 1008 What do you want to do? |
| 1009 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 1009 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 1010 file 'file2' was deleted in other [destination] but was modified in local [working copy]. | 1010 file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
| 1011 What do you want to do? | 1011 What do you want to do? |
| 1012 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 1012 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 1013 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | 1013 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
| 1014 use 'hg resolve' to retry unresolved file merges | 1014 use 'hg resolve' to retry unresolved file merges |
| 1015 [1] | 1015 [1] |
| 1060 (no more unresolved files) | 1060 (no more unresolved files) |
| 1061 --- diff of status --- | 1061 --- diff of status --- |
| 1062 (status identical) | 1062 (status identical) |
| 1063 | 1063 |
| 1064 === :other -> :prompt === | 1064 === :other -> :prompt === |
| 1065 file 'file1' was deleted in local [working copy] but was modified in other [destination]. | 1065 file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
| 1066 What do you want to do? | 1066 What do you want to do? |
| 1067 use (c)hanged version, (d)elete, or leave (u)nresolved? | 1067 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 1068 file 'file2' was deleted in other [destination] but was modified in local [working copy]. | 1068 file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
| 1069 What do you want to do? | 1069 What do you want to do? |
| 1070 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 1070 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 1071 --- diff of status --- | 1071 --- diff of status --- |
| 1072 (status identical) | 1072 (status identical) |
| 1073 | 1073 |
| 1089 (no more unresolved files) | 1089 (no more unresolved files) |
| 1090 --- diff of status --- | 1090 --- diff of status --- |
| 1091 (status identical) | 1091 (status identical) |
| 1092 | 1092 |
| 1093 === :local -> :prompt === | 1093 === :local -> :prompt === |
| 1094 file 'file1' was deleted in local [working copy] but was modified in other [destination]. | 1094 file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
| 1095 What do you want to do? | 1095 What do you want to do? |
| 1096 use (c)hanged version, (d)elete, or leave (u)nresolved? | 1096 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 1097 file 'file2' was deleted in other [destination] but was modified in local [working copy]. | 1097 file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
| 1098 What do you want to do? | 1098 What do you want to do? |
| 1099 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 1099 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 1100 --- diff of status --- | 1100 --- diff of status --- |
| 1101 (status identical) | 1101 (status identical) |
| 1102 | 1102 |
| 1108 === :other -> :fail === | 1108 === :other -> :fail === |
| 1109 --- diff of status --- | 1109 --- diff of status --- |
| 1110 (status identical) | 1110 (status identical) |
| 1111 | 1111 |
| 1112 === :fail -> :prompt === | 1112 === :fail -> :prompt === |
| 1113 file 'file1' was deleted in local [working copy] but was modified in other [destination]. | 1113 file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
| 1114 What do you want to do? | 1114 What do you want to do? |
| 1115 use (c)hanged version, (d)elete, or leave (u)nresolved? | 1115 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 1116 file 'file2' was deleted in other [destination] but was modified in local [working copy]. | 1116 file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
| 1117 What do you want to do? | 1117 What do you want to do? |
| 1118 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | 1118 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
| 1119 --- diff of status --- | 1119 --- diff of status --- |
| 1120 (status identical) | 1120 (status identical) |
| 1121 | 1121 |