A better Vimdiff Git mergetoolProposed tip Please edit this page to improve it, or add your comments below (do not use the discussion page). Please use new tips to discuss whether this page should be a permanent tip, or whether it should be merged to an existing tip. created June 5, 2012 · complexity basic · author Whiteinge · version 7.0 Git ships with support to invoke Vimdiff as a "mergetool" to help resolve merge conflicts
