equal
deleted
inserted
replaced
205 $ hg resolve -q file1 |
205 $ hg resolve -q file1 |
206 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
206 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
207 [1] |
207 [1] |
208 $ grep '<<<' file1 > /dev/null |
208 $ grep '<<<' file1 > /dev/null |
209 |
209 |
|
210 test .orig behavior with resolve |
|
211 |
|
212 $ echo resolve > file |
|
213 $ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig' |
|
214 */file1~base*: (glob) |
|
215 >>> |
|
216 foo |
|
217 <<< |
|
218 */file1~other*: (glob) |
|
219 >>> |
|
220 foo |
|
221 bar |
|
222 <<< |
|
223 $TESTTMP/repo/file1: (glob) |
|
224 >>> |
|
225 foo |
|
226 baz |
|
227 <<< |
|
228 $TESTTMP/repo/file1.orig: (glob) |
|
229 >>> |
|
230 foo |
|
231 baz |
|
232 <<< |
|
233 |
210 resolve <file> should do nothing if 'file' was marked resolved |
234 resolve <file> should do nothing if 'file' was marked resolved |
211 $ echo resolved > file1 |
235 $ echo resolved > file1 |
212 $ hg resolve -m file1 |
236 $ hg resolve -m file1 |
213 $ hg resolve -q file1 |
237 $ hg resolve -q file1 |
214 $ cat file1 |
238 $ cat file1 |