summaryrefslogtreecommitdiff
path: root/t/t6402-merge-rename.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-03 21:49:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-03 21:49:19 -0700
commit6a4f5dadd3d373db29053697aaefc67e31416699 (patch)
tree5feb58eb565bb8cf8cf698c649aedd4601fe7569 /t/t6402-merge-rename.sh
parentMerge branch 'hn/refs-errno-cleanup' (diff)
parentdifftool: fix symlink-file writing in dir-diff mode (diff)
downloadtgif-6a4f5dadd3d373db29053697aaefc67e31416699.tar.xz
Merge branch 'da/difftool-dir-diff-symlink-fix'
"git difftool --dir-diff" mishandled symbolic links. * da/difftool-dir-diff-symlink-fix: difftool: fix symlink-file writing in dir-diff mode
Diffstat (limited to 't/t6402-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions