git_fs: use two way diff when possible, since it is faster