branch-test
Merge branch 'master' into test-branch

Conflicts:
	TestRepoGit/Class1.cs
test_branch change
Merge branch 'test-branch2' into test-branch

Conflicts:
	TestRepoGit/Class1.cs
test-branch change
master change
change master
Merge branch 'test-branch'

Conflicts:
	TestRepoGit/Class1.cs
master/test-branch