diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-02 21:13:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-02 21:13:44 +0000 |
| commit | 679d22d20cf456c6384e077487dea82d623b8441 (patch) | |
| tree | 4866645a0efaed5cccaefc3a741a3302a5c47a8b /git-merge.html | |
| parent | 6fddfe5dae5b964e29b5d594311b4ab3c963b711 (diff) | |
| download | git-htmldocs-679d22d20cf456c6384e077487dea82d623b8441.tar.gz | |
Autogenerated HTML docs for v1.5.2-167-g4bc70
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 f056cefc6..fe792c4a6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -579,7 +579,7 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 29-May-2007 09:17:39 UTC
+Last updated 02-Jun-2007 21:09:48 UTC
</div>
</div>
</body>
|