Merge branch 'jk/add-i-custom-diff-algo'

* jk/add-i-custom-diff-algo: add -i: add extra options at the right place in "diff" command line add--interactive: respect diff.algorithm