Autogenerated HTML docs for v2.4.4-488-gdf97e

1 files changed, 4 insertions, 2 deletions

diff --git a/gitattributes.html b/gitattributes.html
index ac1b3bd98..48c31883e 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1612,7 +1612,7 @@ manual page is a wrong place to talk about it.  However&#8230;</p></div>
 <div class="content">

 <pre><code>[merge "filfre"]

         name = feel-free merge driver

-        driver = filfre %O %A %B

+        driver = filfre %O %A %B %L %P

         recursive = binary</code></pre>

 </div></div>

 <div class="paragraph"><p>The <code>merge.*.name</code> variable gives the driver a human-readable

@@ -1633,6 +1633,8 @@ driver to use when the merge driver is called for an internal
 merge between common ancestors, when there are more than one.

 When left unspecified, the driver itself is used for both

 internal merge and the final merge.</p></div>

+<div class="paragraph"><p>The merge driver can learn the pathname in which the merged result

+will be stored via placeholder <code>%P</code>.</p></div>

 </div>

 <div class="sect3">

 <h4 id="_code_conflict_marker_size_code"><code>conflict-marker-size</code></h4>

@@ -1855,7 +1857,7 @@ frotz   unspecified</code></pre>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

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

+Last updated 2015-06-24 14:09:45 PDT

 </div>

 </div>

 </body>