summaryrefslogtreecommitdiff
path: root/Documentation/config/difftool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-06 23:33:44 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-06 23:33:44 -0800
commitcf4b0714f7d3624cdf5a2a27df865844b7c57cd5 (patch)
tree2e02c40824b14df373e9ebe500d639d52a3ff0ef /Documentation/config/difftool.txt
parentMerge branch 'es/worktree-repair-both-moved' (diff)
parenttest: bisect-porcelain: fix location of files (diff)
downloadtgif-cf4b0714f7d3624cdf5a2a27df865844b7c57cd5.tar.xz
Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files'
A 3-year old test that was not testing anything useful has been corrected. * fc/t6030-bisect-reset-removes-auxiliary-files: test: bisect-porcelain: fix location of files
Diffstat (limited to 'Documentation/config/difftool.txt')
0 files changed, 0 insertions, 0 deletions