Show More
@@ -217,7 +217,7 b' def _imerge(repo, mynode, orig, fcd, fco' | |||
|
217 | 217 | |
|
218 | 218 | ui = repo.ui |
|
219 | 219 | |
|
220 | r = simplemerge.simplemerge(ui, a, b, c, label=labels) | |
|
220 | r = simplemerge.simplemerge(ui, a, b, c, label=labels, no_minimal=True) | |
|
221 | 221 | return True, r |
|
222 | 222 | return False, 0 |
|
223 | 223 |
@@ -47,13 +47,16 b'' | |||
|
47 | 47 | |
|
48 | 48 | $ cat a |
|
49 | 49 | Small Mathematical Series. |
|
50 | <<<<<<< local: 618808747361 - test: branch2 | |
|
50 | 51 | 1 |
|
51 | 52 | 2 |
|
52 | 53 | 3 |
|
53 | <<<<<<< local: 618808747361 - test: branch2 | |
|
54 | 54 | 6 |
|
55 | 55 | 8 |
|
56 | 56 | ======= |
|
57 | 1 | |
|
58 | 2 | |
|
59 | 3 | |
|
57 | 60 | 4 |
|
58 | 61 | 5 |
|
59 | 62 | >>>>>>> other: c0c68e4fe667 - test: branch1 |
@@ -78,13 +81,16 b' Verify custom conflict markers' | |||
|
78 | 81 | |
|
79 | 82 | $ cat a |
|
80 | 83 | Small Mathematical Series. |
|
84 | <<<<<<< local: test 2 | |
|
81 | 85 | 1 |
|
82 | 86 | 2 |
|
83 | 87 | 3 |
|
84 | <<<<<<< local: test 2 | |
|
85 | 88 | 6 |
|
86 | 89 | 8 |
|
87 | 90 | ======= |
|
91 | 1 | |
|
92 | 2 | |
|
93 | 3 | |
|
88 | 94 | 4 |
|
89 | 95 | 5 |
|
90 | 96 | >>>>>>> other: test 1 |
@@ -105,13 +111,16 b' Verify line splitting of custom conflict' | |||
|
105 | 111 | |
|
106 | 112 | $ cat a |
|
107 | 113 | Small Mathematical Series. |
|
114 | <<<<<<< local: test 2 | |
|
108 | 115 | 1 |
|
109 | 116 | 2 |
|
110 | 117 | 3 |
|
111 | <<<<<<< local: test 2 | |
|
112 | 118 | 6 |
|
113 | 119 | 8 |
|
114 | 120 | ======= |
|
121 | 1 | |
|
122 | 2 | |
|
123 | 3 | |
|
115 | 124 | 4 |
|
116 | 125 | 5 |
|
117 | 126 | >>>>>>> other: test 1 |
@@ -145,13 +154,16 b' Verify line trimming of custom conflict ' | |||
|
145 | 154 | |
|
146 | 155 | $ cat a |
|
147 | 156 | Small Mathematical Series. |
|
157 | <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) | |
|
148 | 158 | 1 |
|
149 | 159 | 2 |
|
150 | 160 | 3 |
|
151 | <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) | |
|
152 | 161 | 6 |
|
153 | 162 | 8 |
|
154 | 163 | ======= |
|
164 | 1 | |
|
165 | 2 | |
|
166 | 3 | |
|
155 | 167 | 4 |
|
156 | 168 | 5 |
|
157 | 169 | >>>>>>> other: branch1 |
@@ -172,13 +184,16 b' Verify basic conflict markers' | |||
|
172 | 184 | |
|
173 | 185 | $ cat a |
|
174 | 186 | Small Mathematical Series. |
|
187 | <<<<<<< local | |
|
175 | 188 | 1 |
|
176 | 189 | 2 |
|
177 | 190 | 3 |
|
178 | <<<<<<< local | |
|
179 | 191 | 6 |
|
180 | 192 | 8 |
|
181 | 193 | ======= |
|
194 | 1 | |
|
195 | 2 | |
|
196 | 3 | |
|
182 | 197 | 4 |
|
183 | 198 | 5 |
|
184 | 199 | >>>>>>> other |
General Comments 0
You need to be logged in to leave comments.
Login now