newvar2 /test-branch
Merge branch 'test-branch'

Conflicts:
	TestRepoGit/Class1.cs