summaryrefslogtreecommitdiffstats
path: root/git-merge-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-31 07:25:26 +0900
committerJunio C Hamano <gitster@pobox.com>2018-05-31 07:25:26 +0900
commit944ce257455780f7b55f49fd76c18ea6d0b77b0a (patch)
treef1f01797276aa5db85ae8f696a546c153ff92b28 /git-merge-tree.html
parent309465b1bf49218ee65ee2e621cedf56bcf8b2c1 (diff)
downloadgit-htmldocs-944ce257455780f7b55f49fd76c18ea6d0b77b0a.tar.gz
Autogenerated HTML docs for v2.18.0-rc0
Diffstat (limited to 'git-merge-tree.html')
-rw-r--r--git-merge-tree.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html
index 7ca201187..88f950ef6 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>git-merge-tree(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -778,7 +779,7 @@ entries that match the &lt;branch1&gt; tree.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-01-27 08:11:04 JST
</div>
</div>
</body>