Supply merge.tool option when merging
Supply merge.tool option when merging

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