]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 404c4a5 28c10ec)
Merge branch 'da/difftool'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Oct 2021 17:21:48 +0000 (10:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Oct 2021 17:21:48 +0000 (10:21 -0700)
commit0cc4ec15504c41d9b42709a4f343d3fed9480745
treeecfefe8b10998b6c5010fa8440f6c05767336e2etree | snapshot
parent404c4a54624c3e0ea9066809344a6269c16de69fcommit | diff
parent28c10ecbfcd68062da602de98702bab71d76b12bcommit | diff
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
builtin/difftool.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.