diff --git a/tests/merge-conflict.bats b/tests/merge-conflict.bats index c4285e86998a258f527fbb5dba2062a657df05e0..e2a1b07538de1b32e1fb0e58004b147adc7160fa 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."