add Start Git Post
Update Start Git Post
add branch test1.0
test commit -a
test2 commit -a
use branch test1.0
use branch test2.0
add Git Branch Post
use reset
update
Merge branch 'mytest'

Conflicts:
	_posts/2014-04-10-Start-Git.md
test rebase master test
test2 rebase
add contact 1
add contact 2
add contact
test pick
test pick
add test mergetool
test mergetool on test