New answers tagged


SublimeMerge is worth mentioning. Price: $100 (Evaluate for free – no account, tracking, or time limits) nagware supported OS: linux, win, mac what features you like: 3 way merge, integrates with git mergetool why you think it is user-friendly: it has all the same shortcuts as sublime

Top 50 recent answers are included