摘要： 1Set up vimdiffThe vimdiff as a merge tool will display several buffers to show the yours/theirs/original changes.The key point is to set up the vimdi... 阅读全文