15,533
edits
Changes
→External links
Then when a merge conflict comes up you can:
git mergetool
==See also==
*[[Brief introduction to Git]]
== External links ==
*[http://git-scm.com/ Git]
*[http://git-scm.com/book Git Book]
[[Category:Developers/General|B]]