diff --git a/branching/index.html b/branching/index.html index 21ca658..ce5bc3f 100644 --- a/branching/index.html +++ b/branching/index.html @@ -38,7 +38,7 @@ layout: reference
You can see that Git inserts standard merge conflict markers, much like Subversion, into files when it gets a merge conflict. Now it's up to us to resolve them. We will do it manually here, but check out - git mergetool + git mergetool if you want Git to fire up a graphical mergetool (like kdiff3, emerge, p4merge, etc) instead.
@@ -473,7 +473,7 @@ M README