equal
deleted
inserted
replaced
247 baz |
247 baz |
248 |
248 |
249 .orig files should exists where specified |
249 .orig files should exists where specified |
250 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
250 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
251 merging file1 |
251 merging file1 |
252 creating directory: $TESTTMP/repo/.hg/origbackups (glob) |
252 creating directory: $TESTTMP/repo/.hg/origbackups |
253 merging file2 |
253 merging file2 |
254 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
254 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
255 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
255 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
256 [1] |
256 [1] |
257 $ ls .hg/origbackups |
257 $ ls .hg/origbackups |
268 $ grep '<<<' file1 > /dev/null |
268 $ grep '<<<' file1 > /dev/null |
269 |
269 |
270 test .orig behavior with resolve |
270 test .orig behavior with resolve |
271 |
271 |
272 $ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'" |
272 $ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'" |
273 $TESTTMP/repo/file1.orig: (glob) |
273 $TESTTMP/repo/file1.orig: |
274 >>> |
274 >>> |
275 foo |
275 foo |
276 baz |
276 baz |
277 <<< |
277 <<< |
278 |
278 |