summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-09 12:26:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-09 12:26:37 -0700
commitfa9e7934c780bc804a09bfc88a93825096b3155e (patch)
tree08bd4612db286e3347f417710d64142710ddb00a /git-mergetool.sh
parentMerge branch 'en/checkout-mismerge-fix' (diff)
parentrepository-layout.txt: correct pluralization of 'object' (diff)
downloadtgif-fa9e7934c780bc804a09bfc88a93825096b3155e.tar.xz
Merge branch 'bm/repository-layout-typofix'
Typofix. * bm/repository-layout-typofix: repository-layout.txt: correct pluralization of 'object'
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions