summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6417-merge-ours-theirs.sh')
-rwxr-xr-xt/t6417-merge-ours-theirs.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/t/t6417-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh
index ec065d6a65..62d1406119 100755
--- a/t/t6417-merge-ours-theirs.sh
+++ b/t/t6417-merge-ours-theirs.sh
@@ -7,10 +7,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success setup '
- for i in 1 2 3 4 5 6 7 8 9
- do
- echo "$i"
- done >file &&
+ test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
git add file &&
cp file elif &&
git commit -m initial &&