解决git merge冲突(英文版)

If you are already a vim and git master and you are impatient, please jump to theQuick start section at the end of this article. 1 Set up vimdiff The vimdiff as a merge tool will display several buffe

>>阅读原文<<