Login
From:
Johannes Rudolph's Blog
(Uncensored)
subscribe
Configuring Diffmerge for Git | Johannes Rudolph's Blog
https://jorudolph.wordpress.com/2012/10/04/configuring-diffmerge-for-git/
links
backlinks
Roast topics
Find topics
Find it!
One thing that I do particulary _not_ like about Git is that it doesn’t integrate with mergetools automatically. Mercurial is a bit smarter here – if you have a merge tool installed, it…
