Comment by tom9729

Git does support custom merge "drivers" on a per file basis. For example: https://gist.github.com/seanh/378623