index 554ee0af912368cb842d93c025e742daaf47f5f2..1e4ddfbd114dde8949dc53d423715673a748854f 100644 (file)
------------------------------------------------
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