An alternative approach (less powerful but simpler) might be to reversibly convert the binary files into a mergeable text-like form before committing them. I'v

An alternative approach (less powerful but simpler) might be to reversibly convert the binary files into a mergeable text-like form before committing them. I've never done exactly that but I have occasionally decided how information will be represented in a data file with merging in mind.