equal
deleted
inserted
replaced
199 merging backend.sparse |
199 merging backend.sparse |
200 merging data.py |
200 merging data.py |
201 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') |
201 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') |
202 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') |
202 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') |
203 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
203 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
204 [1] |
204 [240] |
205 $ rm *.orig |
205 $ rm *.orig |
206 $ ls -A |
206 $ ls -A |
207 .hg |
207 .hg |
208 backend.sparse |
208 backend.sparse |
209 data.py |
209 data.py |