Basic support for falling back to 3-way merge when applying

For now only `magit-apply` knows how to do it, we might have to teach other commands about it.