]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93a8ed2 5bafb35)
Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 18:26:17 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 18:26:17 +0000 (11:26 -0700)
* da/difftool-dir-diff-symlink-fix:
  difftool: fix symlink-file writing in dir-diff mode

1  2 
builtin/difftool.c patch | diff1 | diff2 | blob | history
t/t7800-difftool.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/difftool.c
Simple merge
diff --cc t/t7800-difftool.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.