diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-07-01 02:33:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-07-01 02:33:06 +0000 |
| commit | 73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c (patch) | |
| tree | d44e468e3f0b00e132975f80c4aff9d30914d104 /git-merge.html | |
| parent | 688eae05f06ef3b7369c5631140c670296654de1 (diff) | |
| download | git-htmldocs-73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c.tar.gz | |
Autogenerated HTML docs for v1.6.3.3-363-g725cf
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 fced951ac..7b0215d1d 100644 --- a/git-merge.html +++ b/git-merge.html @@ -922,7 +922,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-06-14 01:03:00 UTC
+Last updated 2009-07-01 02:30:56 UTC
</div>
</div>
</body>
|