From 04cc5d8385b1f26bae3d63dddb1fa0f79a3f9223 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 30 Jan 2021 01:42:17 +0200
Subject: [PATCH] Set required Git variables if thy're missing.

---
 tests/merge-conflict.bats | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/merge-conflict.bats b/tests/merge-conflict.bats
index c4285e8..e2a1b07 100644
--- a/tests/merge-conflict.bats
+++ b/tests/merge-conflict.bats
@@ -6,6 +6,8 @@ setup () {
     then
         git init "$repo"
         cd "$repo"
+        git config user.name "Your Name"
+        git config user.email "name@example.com"
         echo 1 > file
         git add file
         git commit -m "Initial commit."
-- 
GitLab