commit4.stash1.branch1
branch merge2
Merge branch 'commit4.stash1'

Conflicts:
	GitDemo/src/main/java/com/czetsuya/git/demo/App.java