Re: [PATCH 1/7] test: add merge style config test
From: Eric Sunshine <hidden>
Date: 2021-06-09 19:43:22
On Wed, Jun 9, 2021 at 3:29 PM Felipe Contreras [off-list ref] wrote:
quoted hunk ↗ jump to hunk
We want to test different combinations of merge.conflictstyle, and a new file is the best place to do that. Signed-off-by: Felipe Contreras <redacted> ---diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh@@ -0,0 +1,44 @@ +fill () { + for i + do + echo "$i" + done +}
This seems to duplicate the behavior of test_write_lines()...
+test_expect_success 'merge' ' + test_create_repo merge && + ( + cd merge && + fill 1 2 3 >content &&
... which could be used here instead:
test_write_lines 1 2 3 >content &&