Git for Windows: Set up P4Merge as default mergetoolRelated Post Link to headingResolve Git merge conflicts the unpainful way