diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-07 07:55:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-07 07:55:46 +0000 |
| commit | 35738e87105e1a11ced6a6b497146bbd189d4fb2 (patch) | |
| tree | 352f4473f85ea0e327b3a0e3b9739d80f8462eb9 /git-merge.html | |
| parent | 14b76487ff861981455b320a2c6d17632997773e (diff) | |
| download | git-htmldocs-35738e87105e1a11ced6a6b497146bbd189d4fb2.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
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 209d0b33d..2f72cda7a 100644 --- a/git-merge.html +++ b/git-merge.html @@ -649,7 +649,7 @@ Resolve the conflicts. <tt>git-diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 23-Dec-2007 08:15:27 UTC
+Last updated 07-Jan-2008 07:50:33 UTC
</div>
</div>
</body>
|