Support 3-way merge

[mk6f33]

Would it be possible to add support to Git's 3-way merge? When doing a merge I don't want it to fail but instead leave markers for user to resolve them.

Right now i'm using this:

Command::new("git").args(["apply", "--3way"]);