am d3eb5e5b: am 24cd2803: allow diff program to be selected explicitly

* commit 'd3eb5e5b3648fc3ead3aa4d27124a06875f9878e':
  allow diff program to be selected explicitly