diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-12-23 08:16:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-12-23 08:16:38 +0000 |
| commit | f556fc2a7c28ca2b4097c2c8b0180de3b8ca7238 (patch) | |
| tree | 492751e5dfadd3be5f438844968502b050c72c54 /git-merge.html | |
| parent | e27cbd23f20512f381606e2b437bfe80c681aa93 (diff) | |
| download | git-htmldocs-f556fc2a7c28ca2b4097c2c8b0180de3b8ca7238.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc1-21-g0e545
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index d075ef769..209d0b33d 100644 --- a/git-merge.html +++ b/git-merge.html @@ -632,7 +632,8 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<h2>SEE ALSO</h2>
<div class="sectionbody">
-<p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a></p>
+<p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>,
+<a href="gitattributes.html">gitattributes(5)</a></p>
</div>
<h2>Author</h2>
<div class="sectionbody">
@@ -648,7 +649,7 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 14-Nov-2007 12:11:38 UTC
+Last updated 23-Dec-2007 08:15:27 UTC
</div>
</div>
</body>
|