summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:02 -0700
commit1958a17fe41ab424d7d655de66a04a7711e7bbd3 (patch)
tree3292b775bbad12eb7741195b50b29df3e08f37d1 /mergetools/vimdiff
parentMerge branch 'aq/upload-pack-use-parse-options' (diff)
parentpathspec: rename free_pathspec() to clear_pathspec() (diff)
downloadtgif-1958a17fe41ab424d7d655de66a04a7711e7bbd3.tar.xz
Merge branch 'jc/clear-pathspec'
We usually call a function that clears the contents a data structure X without freeing the structure itself clear_X(), and call a function that does clear_X() and also frees it free_X(). free_pathspec() function has been renamed to clear_pathspec() to avoid confusion. * jc/clear-pathspec: pathspec: rename free_pathspec() to clear_pathspec()
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions