Use `git mergetool` after error because `-c merge.tool` does not work
Use `git mergetool` after error because `-c merge.tool` does not work

junix/powerline,IvanAli/powerline,IvanAli/powerline,seanfisk/powerline,dragon788/powerline,xfumihiro/powerline,xxxhycl2010/powerline,blindFS/powerline,lukw00/powerline,darac/powerline,blindFS/powerline,DoctorJellyface/powerline,cyrixhero/powerline,prvnkumar/powerline,Liangjianghao/powerline,kenrachynski/powerline,wfscheper/powerline,DoctorJellyface/powerline,S0lll0s/powerline,s0undt3ch/powerline,s0undt3ch/powerline,xxxhycl2010/powerline,wfscheper/powerline,dragon788/powerline,dragon788/powerline,Liangjianghao/powerline,s0undt3ch/powerline,lukw00/powerline,EricSB/powerline,darac/powerline,xfumihiro/powerline,prvnkumar/powerline,cyrixhero/powerline,darac/powerline,EricSB/powerline,russellb/powerline,S0lll0s/powerline,QuLogic/powerline,junix/powerline,seanfisk/powerline,cyrixhero/powerline,Luffin/powerline,Luffin/powerline,russellb/powerline,kenrachynski/powerline,bartvm/powerline,QuLogic/powerline,bartvm/powerline,junix/powerline,russellb/powerline,Luffin/powerline,areteix/powerline,blindFS/powerline,lukw00/powerline,DoctorJellyface/powerline,IvanAli/powerline,bezhermoso/powerline,xxxhycl2010/powerline,seanfisk/powerline,xfumihiro/powerline,EricSB/powerline,Liangjianghao/powerline,bartvm/powerline,S0lll0s/powerline,wfscheper/powerline,QuLogic/powerline,bezhermoso/powerline,kenrachynski/powerline,bezhermoso/powerline,areteix/powerline,areteix/powerline,prvnkumar/powerline