diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-15 13:25:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 13:25:59 -0700 |
| commit | 1575c208eda44b1e6c104caef43e5783f9bcd1a9 (patch) | |
| tree | e9941739d40c7e666b0e7d4da0b2c3b697c9c1dc /git-merge.html | |
| parent | a080bc385ebc70fc11db4081c1acc40b529f421f (diff) | |
| download | git-htmldocs-1575c208eda44b1e6c104caef43e5783f9bcd1a9.tar.gz | |
Autogenerated HTML docs for v1.8.2.1-418-gaec3f
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index 99beab4e0..97e8da2dd 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1397,6 +1397,17 @@ patience </p>
</dd>
<dt class="hdlist1">
+diff-algorithm=[patience|minimal|histogram|myers]
+</dt>
+<dd>
+<p>
+ Tells <em>merge-recursive</em> 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
+ <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>.
+</p>
+</dd>
+<dt class="hdlist1">
ignore-space-change
</dt>
<dt class="hdlist1">
|