X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=90f7a3ac73fdf62986cfbde08455c18a20680fed;hb=e9f0eb9877ceacfc1589c79885bcab0d0a390647;hp=7d84cba6990aa24b68c2e3834b1368fc05011b7d;hpb=cba020deba148456f781af26440808c2caf57909;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index 7d84cba..90f7a3a 100644
--- 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