diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-07-19 02:14:50 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-07-19 02:14:50 +0000 |
commit | bb6e0789b38b1d3ecb600a1ff05cdff4b88f677c (patch) | |
tree | 902103a829e9f09e4159ada8fdc32c6c0ed00ffb /git-merge.html | |
parent | 18b6ff3704218dde27a820b56b39d02b6edb62ea (diff) | |
download | git-htmldocs-bb6e0789b38b1d3ecb600a1ff05cdff4b88f677c.tar.gz |
Autogenerated HTML docs for v1.5.3-rc2-19-gc4fba
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 d42cf1676..c8e8e58dc 100644 --- a/git-merge.html +++ b/git-merge.html @@ -606,7 +606,7 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 13-Jul-2007 05:31:58 UTC
+Last updated 19-Jul-2007 02:09:46 UTC
</div>
</div>
</body>
|