diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-04-02 06:52:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-04-02 06:52:03 +0000 |
| commit | 9572e92f03dbe32702c906280c22868b3b57caa4 (patch) | |
| tree | f53f3bc945a1ce27df7614b1db532ed83ce19d5b /git-merge.html | |
| parent | 0706c80eb5150908b5a08c163848c7e9328923b4 (diff) | |
| download | git-htmldocs-9572e92f03dbe32702c906280c22868b3b57caa4.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-469-gdffc
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 56e38561d..c4100b201 100644 --- a/git-merge.html +++ b/git-merge.html @@ -920,7 +920,7 @@ Look at the originals. <em>git show :1:filename</em> shows the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-28 08:55:22 UTC
+Last updated 2009-04-02 06:49:58 UTC
</div>
</div>
</body>
|