git mergetool setup with p4merge et al Here’s how to get rolling with a good visual merge tool for git. Read More
