add 1 2 3 4.txt
chang a.txt
add a.txt
Merge branch 'develop'

* develop:
  add a.txt
  add 1 2 3 4.txt
chang a
change a
Merge branch 'develop'

* develop:
  chang a

Conflicts:
	a.txt
Merge branch 'master' of https://github.com/monsteryu/git-p2

* 'master' of https://github.com/monsteryu/git-p2:
  add 5.txt