branchmap: explicitly convert file into iterator
Follows up
2a4bfbb52111. This is required for httprangereader, which is not
an iterable itself.
branchmap: close cache file properly
Follows up
2a4bfbb52111.
branchmap: strip '\n' read from cache file as before
Follows up
2a4bfbb52111.
rebase: do not pass in user option to rollback in-memory merge conflict
Nothing passed before
e9e742bd0501.