equal
deleted
inserted
replaced
199 rebasing 2:b91df4f39e75 tip "edit hide" |
199 rebasing 2:b91df4f39e75 tip "edit hide" |
200 temporarily included 2 file(s) in the sparse checkout for merging |
200 temporarily included 2 file(s) in the sparse checkout for merging |
201 merging hide |
201 merging hide |
202 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') |
202 warning: conflicts while merging hide! (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 |
205 |
206 $ hg debugsparse |
206 $ hg debugsparse |
207 [exclude] |
207 [exclude] |
208 hide* |
208 hide* |
209 |
209 |