Use Git terminology in docs to avoid confusion

12 years ago · ad2c21779d
parent 244bd7b987
commit ad2c21779d
1 changed files with 1 additions and 1 deletions
--- a/doc/index.html
+++ b/doc/index.html
@ -506,7 +506,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
        </li>
        <li>
            After a successful testing phase, the whole "master"
-            branch will be merged (moved) into "stable".
+            branch will be merged into "stable" (fast-forward).
        </li>
    </ul>
 </div>