git mergetool explained

>> YOUR LINK HERE: ___ http://youtube.com/watch?v=wxh-AOxPX_A

This video describes how to fix merge conflicts between files where multiple developers have modified the same file and now you're having to use the mergetool

git mergetool, git, mergetool, programming, merge conflict
#############################