summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-27 10:59:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-27 10:59:23 -0700
commitc473af7396b9d5ac39d1164434788fef6da80919 (patch)
tree3b3a7250eaf2273e440da7ada4d7a54afc7fb0b8 /git-merge-one-file.sh
parentMerge branch 'sb/submodule-update-initial-runs-custom-script' (diff)
parentt7004, t7030: fix here-doc syntax errors (diff)
downloadtgif-c473af7396b9d5ac39d1164434788fef6da80919.tar.xz
Merge branch 'st/verify-tag'
A few unterminated here documents in tests were fixed, which in turn revealed incorrect expectations the tests make. These tests have been updated. * st/verify-tag: t7004, t7030: fix here-doc syntax errors
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions