summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff3
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-09 12:03:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-09 12:03:26 -0700
commit3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch)
tree5f5b11703f64319bcb71603c825d382f4703a763 /mergetools/gvimdiff3
parentMerge branch 'cn/fetch-prune-overlapping-destination' into maint (diff)
parentcode and test: fix misuses of "nor" (diff)
downloadtgif-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'mergetools/gvimdiff3')
0 files changed, 0 insertions, 0 deletions