Extract log retrieving function as s:get_log()
Improve rebasing / other conflict handling

Distinguish Rebasing and other Unmerged conflicts,
provide different log info formats for each.
Fix rebasing detection when not in toplevel
Fix reopen #info and minor change log wording