Autogenerated HTML docs for v2.3.4-263-gf53fc

1 files changed, 4 insertions, 4 deletions

diff --git a/git-merge.html b/git-merge.html
index 61aea9c8b..af2757447 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1215,7 +1215,7 @@ area.  You cannot tell how many lines are deleted and replaced with
 Barbie’s remark on your side.  The only thing you can tell is that your

 side wants to say it is hard and you’d prefer to go shopping, while the

 other side wants to claim it is easy.</p></div>

-<div class="paragraph"><p>An alternative style can be used by setting the "merge.conflictstyle"

+<div class="paragraph"><p>An alternative style can be used by setting the "merge.conflictStyle"

 configuration variable to "diff3".  In "diff3" style, the above conflict

 may look like this:</p></div>

 <div class="listingblock">

@@ -1554,7 +1554,7 @@ substitutes the changed version instead.</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

-merge.conflictstyle

+merge.conflictStyle

 </dt>

 <dd>

 <p>

@@ -1806,7 +1806,7 @@ merge.&lt;driver&gt;.recursive
 </p>

 </dd>

 <dt class="hdlist1">

-branch.&lt;name&gt;.mergeoptions

+branch.&lt;name&gt;.mergeOptions

 </dt>

 <dd>

 <p>

@@ -1839,7 +1839,7 @@ branch.&lt;name&gt;.mergeoptions
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-06-03 15:14:46 PDT

+Last updated 2015-03-23 14:31:16 PDT

 </div>

 </div>

 </body>