From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Oct 2021 17:21:48 +0000 (-0700)
Subject: Merge branch 'da/difftool'
X-Git-Tag: v2.34.0-rc0~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cc4ec15504c41d9b42709a4f343d3fed9480745;p=thirdparty%2Fgit.git

Merge branch 'da/difftool'

Code clean-up in "git difftool".

* da/difftool:
  difftool: add a missing space to the run_dir_diff() comments
  difftool: remove an unnecessary call to strbuf_release()
  difftool: refactor dir-diff to write files using helper functions
  difftool: create a tmpdir path without repeated slashes
---

0cc4ec15504c41d9b42709a4f343d3fed9480745