summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
commit4daf5c864348e8d2002b082d8ac484c650e395d4 (patch)
tree9d5d764dd36e3d502302bed2591b29dd3be440c4 /mergetools/xxdiff
parentMerge branch 'sp/doc-update-index-cacheinfo' (diff)
parentconfig: avoid a funny sentinel value "a^" (diff)
downloadtgif-4daf5c864348e8d2002b082d8ac484c650e395d4.tar.xz
Merge branch 'ta/config-add-to-empty-or-true-fix'
"git config --add section.var val" used to lose existing section.var whose value was an empty string. * ta/config-add-to-empty-or-true-fix: config: avoid a funny sentinel value "a^" make config --add behave correctly for empty and NULL values
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions