Hi Junio, On Sun, 14 Feb 2016, Junio C Hamano wrote: > Felipe Gonçalves Assis <felipeg.assis@xxxxxxxxx> writes: > > > The usual workaround is using the resolve strategy, but apparently it > > ignores the custom merge driver. > > Hmph. > > Indeed, git-merge-file seems to call xdl_merge() directly, bypassing > the ll_merge(), which is understandable as the former predates the > latter. That needs to be fixed, I think. I think this is by design. (Because I designed it.) The original idea of git-merge-file was to serve as a drop-in replacement for GNU/BSD merge when you want to avoid to be subject to the vagaries of the GNU vs BSD implementations. Ciao, Dscho