summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-04-17 10:23:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-18 04:49:28 (GMT)
commitb510f0beab2e251175ea3d021129b6029c370aa4 (patch)
tree0739b537ecaf79eb23c00cc8f7b537c2a5a09855 /t/t3507-cherry-pick-conflict.sh
parentd74f3e58114d1a8544592fcd5dcdfe0fc4993d27 (diff)
downloadgit-b510f0beab2e251175ea3d021129b6029c370aa4.zip
git-b510f0beab2e251175ea3d021129b6029c370aa4.tar.gz
git-b510f0beab2e251175ea3d021129b6029c370aa4.tar.bz2
t7600: clean up style
Clean up the 'merge --squash c3 with c7' test by removing some unnecessary braces and removing a pipe. Also, generally cleanup style by unindenting a here-doc, removing stray spaces after a redirection operator and allowing sed to open its own input instead of redirecting input from the shell. Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions