test_git2
conflict test
Merge branch 'test' of github.com:chiupeter/test_git into test

Conflicts:
	branch.cpp