Category Archives: Git HOWTO

Instructions/Postings on anything and everything related to Git, GitHub, GitGui.

Adding p4merge to mergetool in Git

Posted on 2012/01/15 by Administrator

So I needed to merge some stuff on BlazeRouter_S for my thesis work and since I’m using Git for software configuration management, I had to setup a worthy diff tool to help me resolve the conflicts I was experiencing in … Continue reading →

Posted in Git HOWTO | Tagged , , , , , | Leave a comment