Felipe Gonçalves Assis <felipeg.as...@gmail.com> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
