summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:21 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:21 +0900
commit22ddc4bf29160d04eaff78d1acb04ca153ec5dde (patch)
treedf2853c7a517ec21a30d46b43460264eb5a265a4 /xdiff-interface.h
parentMerge branch 'ma/lockfile-fixes' (diff)
parentmerge-ours: do not use cmd_*() as a subroutine (diff)
downloadtgif-22ddc4bf29160d04eaff78d1acb04ca153ec5dde.tar.xz
Merge branch 'jc/no-cmd-as-subroutine'
Calling cmd_foo() as if it is a general purpose helper function is a no-no. Correct two instances of such to set an example. * jc/no-cmd-as-subroutine: merge-ours: do not use cmd_*() as a subroutine describe: do not use cmd_*() as a subroutine
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions