CommitMessage: Change in TestBranch.
Workspace file added.
Nice message.
 Please enter the commit message for your changes. Lines starting
MyMessage
End of turn.
hest
Insert mode.
Merge branch 'TestBranch'

Conflicts:
	test/hotciv/standard/TestAlphaCiv.java
Ignore file added.
Delete the files!
Some text added.
MyCommit
Real commit!
Merge branch 'TestBranch'