diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
| commit | a77a51375dec1ea55c96563953187d6ce3d924cd (patch) | |
| tree | bd5e64c4f3d367dcf2be694575f0e5edcb03b1a7 /git-merge.html | |
| parent | 359b40ddcc057e3c5e382544a151c97db2db5002 (diff) | |
| download | git-htmldocs-a77a51375dec1ea55c96563953187d6ce3d924cd.tar.gz | |
Autogenerated HTML docs for v1.5.2.1-144-gabc40
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 fe792c4a6..ea2db0721 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 02-Jun-2007 21:09:48 UTC
+Last updated 08-Jun-2007 16:08:19 UTC
</div>
</div>
</body>
|