From: Oleg Broytman <phd@phdru.name>
Date: Thu, 25 Jun 2015 21:11:30 +0000 (+0300)
Subject: Clarify that "strategy" is merge strategy
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=e9f0eb9877ceacfc1589c79885bcab0d0a390647;p=git-wiki.git

Clarify that "strategy" is merge strategy
---

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