summaryrefslogtreecommitdiffstats
path: root/git-merge-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-31 11:32:55 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-31 11:32:55 +0000
commit6f1bbb744abfc4656c864209edfbed8f195593b9 (patch)
tree81c34ab778692e40c3a9db19b0a9474e8e919af2 /git-merge-file.html
parent61b122905f8de706c660483fe1d4d99fe143e0d2 (diff)
downloadgit-htmldocs-6f1bbb744abfc4656c864209edfbed8f195593b9.tar.gz
Autogenerated HTML docs for v1.6.0.3-535-g933bb
Diffstat (limited to 'git-merge-file.html')
-rw-r--r--git-merge-file.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-file.html b/git-merge-file.html
index 1cbe55525..9065e4e06 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -425,7 +425,7 @@ with parts copied from the original documentation of RCS <em>merge</em>.</p></di
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:33:02 UTC
+Last updated 2008-10-31 11:28:40 UTC
</div>
</div>
</body>