add git diff/merge exit 0