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