summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:09 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:09 +0900
commit322117755950a1b69129e1b9bb5d494a3ee53491 (patch)
tree1d3d5bdd11019c79de2d4ef6f21e6b4898d3aa84 /merge.c
parentMerge branch 'ab/drop-scripted-rebase' (diff)
parentt4038-diff-combined: quote paths with whitespace (diff)
downloadtgif-322117755950a1b69129e1b9bb5d494a3ee53491.tar.xz
Merge branch 'tz/t4038-bash-redirect-target-workaround'
Work-around extra warning from bash in our tests. * tz/t4038-bash-redirect-target-workaround: t4038-diff-combined: quote paths with whitespace
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions