commit in branch 1
commit in branch 2
committing a new method in branch 1
merge commit with branch 1

Conflicts:
	TestProject/src/com/n0napa/tests/DummyTests.java
Merge branch 'topic-branch-2'

Conflicts:
	TestProject/src/com/n0napa/tests/DummyTests.java