summaryrefslogtreecommitdiffstats
path: root/git-mergetool.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-04-02 06:52:03 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-04-02 06:52:03 +0000
commit9572e92f03dbe32702c906280c22868b3b57caa4 (patch)
treef53f3bc945a1ce27df7614b1db532ed83ce19d5b /git-mergetool.html
parent0706c80eb5150908b5a08c163848c7e9328923b4 (diff)
downloadgit-htmldocs-9572e92f03dbe32702c906280c22868b3b57caa4.tar.gz
Autogenerated HTML docs for v1.6.2.1-469-gdffc
Diffstat (limited to 'git-mergetool.html')
-rw-r--r--git-mergetool.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.html b/git-mergetool.html
index ff86ab5c4..e884caf44 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -413,7 +413,7 @@ success of the resolution after the custom tool has exited.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-02-14 08:18:25 UTC
+Last updated 2009-04-02 06:49:57 UTC
</div>
</div>
</body>