Clarify that "strategy" is merge strategy

[git-wiki.git] / pep-git.txt

diff --git a/pep-git.txt b/pep-git.txt
index 7d84cba6990aa24b68c2e3834b1368fc05011b7d..90f7a3ac73fdf62986cfbde08455c18a20680fed 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -463,7 +463,7 @@ feature was implemented should be in the commit messages.
 Null-merges
 ===========
 
-Git has a builtin strategy for what Python core developers call
+Git has a builtin merge strategy for what Python core developers call
 "null-merge"::
 
     $ git merge -s ours v1  # null-merge v1 into v2