hg merge的时候, 不会自动提交, git merge的时候会自动提交commit.
hg merge
git merge
git如何实现hg merge那样的merge但不提交呢?
http://stackoverflow.com/questions/8640887/git-merge-without-auto-commit
http://stackoverflow.com/questions/8640887/git-merge-without-auto-commit