summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:35 -0700
commit83510ef3fda0df6acd6680410698a1762042a8af (patch)
tree112701a03dafcf18dd35b36ccf064f5f22243800 /git-mergetool--lib.sh
parentMerge branch 'ah/grammofix' (diff)
parentstylefix: asterisks stick to the variable, not the type (diff)
downloadtgif-83510ef3fda0df6acd6680410698a1762042a8af.tar.xz
Merge branch 'da/styles'
* da/styles: stylefix: asterisks stick to the variable, not the type
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions