Archive

Posts Tagged ‘vimdiff’

How to use `git mergetool` to resolve conflicts

February 18, 2019 Leave a comment

https://gist.github.com/karenyyng/f19ff75c60f18b4b8149

Have the following in .gitconfig

[merge]                                                                                                                           
    tool = vimdiff  
Categories: git Tags: ,