diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:37:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:37:10 +0000 |
| commit | 4604fe5609a48fc240d1a88a15c642c9883363c7 (patch) | |
| tree | 846c5b418d438e9580d0a7702be832f1d1d9874c /git-merge.html | |
| parent | 5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff) | |
| download | git-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index a9ad58d58..556282d8d 100644 --- a/git-merge.html +++ b/git-merge.html @@ -827,7 +827,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-13 06:06:56 UTC
+Last updated 2008-09-19 06:33:03 UTC
</div>
</div>
</body>
|