git mergetool 解决冲突的问题

git mergetool

http://blog.csdn.net/u012150179/article/details/14047183