verExa 1
verExa 2
version 2.0
version 2.1
version 2.2
Merge branch 'b' into d

Conflicts:
	TestGit/src/test.java
version 2
version 2
version 5