summaryrefslogtreecommitdiffstats
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2021-12-09 06:11:04 +0100
committerJunio C Hamano <gitster@pobox.com>2021-12-13 19:29:48 +0100
commit020b813f400b55528edca00aff4d8e95080376f6 (patch)
tree751e5e1376bd0f1a214fcb8f6fbc78bc5d9908a7 /builtin/merge-ours.c
parentt9107: use shell parameter expansion to avoid breaking &&-chain (diff)
downloadgit-020b813f400b55528edca00aff4d8e95080376f6.tar.xz
git-020b813f400b55528edca00aff4d8e95080376f6.zip
tests: simplify construction of large blocks of text
Take advantage of here-docs to create large blocks of text rather than using a series of `echo` statements. Not only are here-docs a natural fit for such a task, but there is less opportunity for a broken &&-chain. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions