Merge branch 'jk/external-diff-use-argv-array'