Been using Git for a while now and getting to like it. Found out some more info about some of the commands. The commands I gave previously for adding p4merge as the merge tool didn’t do quite what I was expecting, and didn’t actually work :) After expecting git to use this merge tool whenever [...]
Tags: git
