summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-07-21 21:58:33 +0000
committerJunio C Hamano <junio@kernel.org>2010-07-21 21:58:33 +0000
commit08acb7398c92bb884358c5699e57c1c15133b71b (patch)
tree2a09f8dbd026f25e2b86d7bd7ee341c9d2d5983e /git-merge-one-file.html
parentafabd32f6189eafdf7bbef1ee32c6dd60674063e (diff)
downloadgit-htmldocs-08acb7398c92bb884358c5699e57c1c15133b71b.tar.gz
Autogenerated HTML docs for v1.7.2
Diffstat (limited to 'git-merge-one-file.html')
-rw-r--r--git-merge-one-file.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index b9222122c..270c39cfe 100644
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -342,7 +342,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.<
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-04-24 02:56:00 UTC
+Last updated 2010-07-21 21:55:29 UTC
</div>
</div>
</body>