Bug#935159: gitg: FTBFS: test failure if user has non-default merge.conflictstyle

[Simon McVittie]

Package: gitg
Version: 3.30.1-2
Severity: normal

My ~/.gitconfig contains:

[merge]
	conflictstyle = diff3

With this configuration, I get a test failure when I build without using
sbuild:

> ERROR:tests/gitg/4cdc306@@tests-gitg at exe/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")

Ideally, the upstream source code of gitg should isolate the tests from
the user's git configuration, perhaps by running with a temporary, empty
$HOME. The next best thing would be for the Debian packaging to do so.

    smcv