From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Apr 2014 20:39:03 +0000 (-0700)
Subject: Merge branch 'rr/doc-merge-strategies' into maint
X-Git-Tag: v1.9.2~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/38245956648c54d138efc7b95b450dc7203e2a2f?ds=inline;hp=-c

Merge branch 'rr/doc-merge-strategies' into maint

* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
---

38245956648c54d138efc7b95b450dc7203e2a2f
diff --combined Documentation/merge-strategies.txt
index fb6e593e7c,81e349309c..feabc1ccf4
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@@ -1,10 -1,10 +1,10 @@@
  MERGE STRATEGIES
  ----------------
  
- The merge mechanism ('git-merge' and 'git-pull' commands) allows the
+ The merge mechanism (`git merge` and `git pull` commands) allows the
  backend 'merge strategies' to be chosen with `-s` option.  Some strategies
  can also take their own options, which can be passed by giving `-X<option>`
- arguments to 'git-merge' and/or 'git-pull'.
+ arguments to `git merge` and/or `git pull`.
  
  resolve::
  	This can only resolve two heads (i.e. the current branch
@@@ -113,11 -113,3 +113,11 @@@ subtree:
  	match the tree structure of A, instead of reading the trees at
  	the same level. This adjustment is also done to the common
  	ancestor tree.
 +
 +With the strategies that use 3-way merge (including the default, 'recursive'),
 +if a change is made on both branches, but later reverted on one of the
 +branches, that change will be present in the merged result; some people find
 +this behavior confusing.  It occurs because only the heads and the merge base
 +are considered when performing a merge, not the individual commits.  The merge
 +algorithm therefore considers the reverted change as no change at all, and
 +substitutes the changed version instead.