Close GH-292: Fixes #237, binary files were always in conflict, even for same files.