git add "-y" in difftool