da/difftool (was: Re: What's cooking in git.git (Sep 2021, #08; Mon, 27))

On Mon, Sep 27 2021, Junio C Hamano wrote:

* da/difftool (2021-09-23) 4 commits
 - difftool: add a missing space to the run_dir_diff() comments
 - difftool: create a tmpdir path without repeated slashes
 - Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
 - Merge branch 'ab/retire-option-argument' into da/difftool
 (this branch uses da/difftool-dir-diff-symlink-fix.)

 Code clean-up in "git difftool".

 Will merge to 'next'?

I think so, I looked it over and left a comment about a weird edge case
in the pre-image to do with negative return codes, but all of the logic
seems OK to me.