[MERGE] Handle missing tools gracefully for diff --using (was: [MERGE] Implement diff --using natively)

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C477526FA.4050006%40aaronbentley.com%3E