git-both: for comparing binary conflicts