Pass preferred diff options to p4 resolve. Fixes #174.
Merge branch 'master' of github.com:gareth-rees/p4.el