summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-11-04 14:20:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-11-04 14:20:46 -0800
commit7974b3fd75bb37b58e2504758e95c2ac81434219 (patch)
tree588d7d8fb4683a277d7b296ae953fb4dddf9dd10 /git-mergetool--lib.sh
parentMerge branch 'jc/em-dash-in-doc' into maint (diff)
parentDocumentation/everyday: match undefline with the text (diff)
downloadtgif-7974b3fd75bb37b58e2504758e95c2ac81434219.tar.xz
Merge branch 'jc/everyday-markup' into maint
AsciiDoc markup fixes. * jc/everyday-markup: Documentation/everyday: match undefline with the text
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions