Wrappers for `diff` and `merge` to use `p4merge` with `git` - View it on GitHub