magit/magit — pull request #1580 by tarsius (2014-10-27 22:38:33+00:00)
Title: 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.