summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 15:59:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 15:59:23 +0900
commitc0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e (patch)
tree12d81309e4c60bd20bef4c9fb374729472831a77 /mergetools/tkdiff
parentMerge branch 'ls/checkout-encoding' (diff)
parentglossary: substitute "ancestor" for "direct ancestor" in 'push' description. (diff)
downloadtgif-c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e.tar.xz
Merge branch 'so/glossary-ancestor'
Docfix. * so/glossary-ancestor: glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions