git-conflicts uses git diff