summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-22 13:10:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-22 13:10:19 -0800
commitfa7b63d2f142bec8fe0568761e1c9c22ec877bca (patch)
tree32def7720cd9f4c362b9ddccf7efba04979aa308 /mergetools/ecmerge
parentStart preparing for 2.7.2 (diff)
parentstripspace: call U+0020 a "space" instead of a "blank" (diff)
downloadtgif-fa7b63d2f142bec8fe0568761e1c9c22ec877bca.tar.xz
Merge branch 'ah/stripspace-optstring' into maint
* ah/stripspace-optstring: stripspace: call U+0020 a "space" instead of a "blank"
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions