From e9f0eb9877ceacfc1589c79885bcab0d0a390647 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 26 Jun 2015 00:11:30 +0300 Subject: [PATCH] Clarify that "strategy" is merge strategy --- pep-git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5