From ea759dbf93636d2c148b929b0974450885f7689f Mon Sep 17 00:00:00 2001 From: Jeffrey Guenther Date: Tue, 15 May 2012 22:06:49 -0700 Subject: [PATCH] Fixed docs links to link to git-scm/docs --- branching/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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

- docs   + docs   book git branch @@ -49,7 +49,7 @@ layout: reference

- docs   + docs   book git checkout @@ -226,7 +226,7 @@ Deleted branch testing (was 78b2670).

- docs   + docs   book git merge @@ -421,7 +421,7 @@ nearly every programming language.

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

- docs   + docs   book git log @@ -693,7 +693,7 @@ ab5ab4c added erlang

- docs   + docs   book git tag