diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-02-24 01:12:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-02-24 01:12:54 +0000 |
| commit | 86660db0e9fd6802c7497256f578a35d718a0503 (patch) | |
| tree | 8a792b59b396e4e2702c373b30e077e4f57df321 /gitattributes.html | |
| parent | 74a198f6cddc06d2bdd1aa65774f9d76400cf914 (diff) | |
| download | git-htmldocs-86660db0e9fd6802c7497256f578a35d718a0503.tar.gz | |
Autogenerated HTML docs for v1.7.0-87-g0901d
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gitattributes.html b/gitattributes.html index d08fac81e..8e74e3396 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -871,7 +871,8 @@ command to run to merge ancestor's version (<tt>%O</tt>), current version (<tt>%A</tt>) and the other branches' version (<tt>%B</tt>). These
three tokens are replaced with the names of temporary files that
hold the contents of these versions when the command line is
-built.</p></div>
+built. Additionally, %L will be replaced with the conflict marker
+size (see below).</p></div>
<div class="para"><p>The merge driver is expected to leave the result of the merge in
the file named with <tt>%A</tt> by overwriting it, and exit with zero
status if it managed to merge them cleanly, or non-zero if there
@@ -1056,7 +1057,7 @@ frotz unspecified</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-02-13 01:00:01 UTC
+Last updated 2010-02-24 01:12:36 UTC
</div>
</div>
</body>
|