diff3 for git!