Isolate test suite from local environment
If global config contains diff3 style
$ git config --global --get merge.conflictstyle
diff3
it will break the test suite (which expects default merge style format)
ok 7 /GitgTestMergeRef/merge-theirs-conflicts-no-checkout
Bail out! gitg:ERROR:tests/gitg/tests-gitg.p/support-test.vala:59:gitg_test_assert_assert_file_contents: assertion failed ((contents) == (expected_contents)): ("<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n" == "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n")
stderr:
(process:6): Gtk-CRITICAL **: 10:10:32.431: gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
**
gitg:ERROR:tests/gitg/tests-gitg.p/support-test.vala:59:gitg_test_assert_assert_file_contents: assertion failed ((contents) == (expected_contents)): ("<<<<<<< ours\nc file other content\n|||||||\n=======\nc file\n>>>>>>> theirs\n" == "<<<<<<< ours\nc file other content\n=======\nc file\n>>>>>>> theirs\n")
We need an initial setup that reads a global config file that overrides any other config
NOTE: Probably a local .config will work too