diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 17:25:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 17:25:34 +0900 |
| commit | 96153bf70f5b69b8c480445c9aed3782ef6776a3 (patch) | |
| tree | e0081b96a5c6731fbb3f2bccce0be798a33c2201 /git-merge.html | |
| parent | bbb584b1065a684f3ce95ab24b609bd800e6cae1 (diff) | |
| download | git-htmldocs-96153bf70f5b69b8c480445c9aed3782ef6776a3.tar.gz | |
Autogenerated HTML docs for v2.17.0-391-g1f1cd
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index 6a605189a..04d1343fd 100644 --- a/git-merge.html +++ b/git-merge.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(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -1797,6 +1798,11 @@ examdiff </li>
<li>
<p>
+guiffy
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>
@@ -1943,7 +1949,7 @@ branch.<name>.mergeOptions <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>
|