Show More
@@ -298,7 +298,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
298 | 298 | for f, m in sorted(prompts): |
|
299 | 299 | if m == "cd": |
|
300 | 300 | if repo.ui.promptchoice( |
|
301 |
_(" |
|
|
301 | _("local changed %s which remote deleted\n" | |
|
302 | 302 | "use (c)hanged version or (d)elete?") % f, |
|
303 | 303 | (_("&Changed"), _("&Delete")), 0): |
|
304 | 304 | act("prompt delete", "r", f) |
@@ -42,7 +42,7 b' 840e2b315c1f: Fix misleading error and p' | |||
|
42 | 42 | Non-interactive merge: |
|
43 | 43 | |
|
44 | 44 | $ hg merge -y |
|
45 |
|
|
|
45 | local changed file1 which remote deleted | |
|
46 | 46 | use (c)hanged version or (d)elete? c |
|
47 | 47 | remote changed file2 which local deleted |
|
48 | 48 | use (c)hanged version or leave (d)eleted? c |
@@ -70,7 +70,7 b' Interactive merge:' | |||
|
70 | 70 | > c |
|
71 | 71 | > d |
|
72 | 72 | > EOF |
|
73 |
|
|
|
73 | local changed file1 which remote deleted | |
|
74 | 74 | use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
75 | 75 | use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 | 76 | (branch merge, don't forget to commit) |
@@ -97,11 +97,11 b' Interactive merge with bad input:' | |||
|
97 | 97 | > baz |
|
98 | 98 | > c |
|
99 | 99 | > EOF |
|
100 |
|
|
|
100 | local changed file1 which remote deleted | |
|
101 | 101 | use (c)hanged version or (d)elete? unrecognized response |
|
102 |
|
|
|
102 | local changed file1 which remote deleted | |
|
103 | 103 | use (c)hanged version or (d)elete? unrecognized response |
|
104 |
|
|
|
104 | local changed file1 which remote deleted | |
|
105 | 105 | use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
106 | 106 | use (c)hanged version or leave (d)eleted? unrecognized response |
|
107 | 107 | remote changed file2 which local deleted |
@@ -126,7 +126,7 b' Interactive merge with not enough input:' | |||
|
126 | 126 | $ hg merge --config ui.interactive=true <<EOF |
|
127 | 127 | > d |
|
128 | 128 | > EOF |
|
129 |
|
|
|
129 | local changed file1 which remote deleted | |
|
130 | 130 | use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
131 | 131 | use (c)hanged version or leave (d)eleted? abort: response expected |
|
132 | 132 | [255] |
@@ -617,7 +617,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
617 | 617 | resolving manifests |
|
618 | 618 | overwrite: False, partial: False |
|
619 | 619 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
|
620 |
|
|
|
620 | local changed a which remote deleted | |
|
621 | 621 | use (c)hanged version or (d)elete? c |
|
622 | 622 | a: prompt keep -> a |
|
623 | 623 | b: versions differ -> m |
General Comments 0
You need to be logged in to leave comments.
Login now