X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Ftutorial.txt;h=1e4ddfbd114dde8949dc53d423715673a748854f;hb=9b8dc263e1b0d470cc67a824837d8884ae3e7136;hp=554ee0af912368cb842d93c025e742daaf47f5f2;hpb=75c3a5ccdf114b5485e4828db1923bf4a35b19e2;p=git.git diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 554ee0af9..1e4ddfbd1 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -141,7 +141,7 @@ $ git commit -a ------------------------------------------------ at this point the two branches have diverged, with different changes -made in each. To merge the changes made in the two branches, run +made in each. To merge the changes made in experimental into master, run ------------------------------------------------ $ git pull . experimental