no message
lo
rwt
branch-test
Merge branch 'master' into test-branch

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

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

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

Conflicts:
	TestRepoGit/Class1.cs