When updating my user profile I lost some configuration settings which of course I had to go lookup again. I thought I would write them here for reference (mainly mine!). I like using the Perforce p4merge tool rather than the stock diff/merge tools and find this to be one of my favourites with BeyondCompare my second favourite and top choice for comparing directories. P4merge is great as you can install just the merge client when running the installer skipping out on the Perforce client and get this great merge tool (for free) even if you aren't using Perforce as your VCS.
I have included commands for TortoiseGit here but with minor adjustments they should apply to most VCS tools:
Diff viewer: C:\Program Files\Perforce\p4merge.exe %base %mine
Merge tool: C:\Program Files\Perforce\p4merge.exe %base %theirs %mine %merged
No comments:
Post a Comment