[PATCH] git-merge(1): document diff-algorithm option to merge-recursive

From: John Keeping <john@keeping.me.uk>
Date: Apr 5, 2013, 11:37 UTC
Message-ID: <8caba965bddcffd75972c730985b04a1eef3744e.1365161840.git.john@keeping.me.uk>

Commit 07924d4 (diff: Introduce --diff-algorithm command line option 2013-01-16) added diff-algorithm as a parameter to the recursive merge strategy but did not document it. Do so.

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 Documentation/merge-strategies.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 66db802..49a9a7d 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -48,6 +48,12 @@ patience;;
 	this when the branches to be merged have diverged wildly.
 	See also linkgit:git-diff[1] `--patience`.
 
+diff-algorithm=[patience|minimal|histogram|myers];;
+	Tells 'merge-recursive' to use a different diff algorithm, which
+	can help avoid mismerges that occur due to unimportant matching
+	lines (such as braces from distinct functions).  See also
+	linkgit:git-diff[1] `--diff-algorithm`.
+
 ignore-space-change;;
 ignore-all-space;;
 ignore-space-at-eol;;

-- 
1.8.2.540.gf023cfe