Use vimdiff to resolve git conflictions

diffg RE
diffg BA
diffg LO


and the right one in the 3-top windows are the code you had wrote

posted @ 2017-03-30 10:44  redstar9451  阅读(138)  评论(0)  编辑  收藏  举报