equal
deleted
inserted
replaced
199 baz |
199 baz |
200 |
200 |
201 .orig files should exists where specified |
201 .orig files should exists where specified |
202 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
202 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
203 merging file1 |
203 merging file1 |
204 creating directory: $TESTTMP/repo/.hg/origbackups |
204 creating directory: $TESTTMP/repo/.hg/origbackups (glob) |
205 merging file2 |
205 merging file2 |
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 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
207 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
208 [1] |
208 [1] |
209 $ ls .hg/origbackups |
209 $ ls .hg/origbackups |