Re: Implementing git-am -3 with git-apply -3?

2015-05-25 Thread Junio C Hamano
Paul Tan writes: > I wonder if it is possible to implement the 3-way merge in git-am > using git-apply. Are there any issues/deficiencies that I need to be > aware of? Anything is possible ;-) Even though I suspect it might be of significant complexity, it certainly would be nice if "apply -3"

Implementing git-am -3 with git-apply -3?

2015-05-25 Thread Paul Tan
Hi Junio, I noticed that you implemented a 3-way merge fallback[1] in git-apply that is meant to be similar to git-am's. I wonder if it is possible to implement the 3-way merge in git-am using git-apply. Are there any issues/deficiencies that I need to be aware of? So far, I noticed that: * git