3 ms·

Check out kdiff3

• u801e 9y ago
  vimdiff is another one. Searching for merge.tool and diff.tool in the git-config man page shows a list of programs that git supports for conflict resolution.