merge: simplify merge_tree logic

With merge_branch and no merge_tree, default to git_url for merge_tree. Also finally just fetch and merge as it should be.

Part of #233 (closed)