summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2017-01-28 22:40:06 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-30 14:07:52 -0800
commitdb101991414f4e14b3763b4843dddcca6b31b40b (patch)
tree099c444d1fe24c075239d00af6d93ce24249b676 /t/t3310-notes-merge-manual-resolve.sh
parentadd SWAP macro (diff)
downloadtgif-db101991414f4e14b3763b4843dddcca6b31b40b.tar.xz
apply: use SWAP macro
Use the exported macro SWAP instead of the file-scoped macro swap and remove the latter's definition. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions