diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-25 17:34:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 17:34:37 -0800 |
| commit | a372d5bb569776befd395d9c66067ecc09f13b96 (patch) | |
| tree | e9f46a0ff18a8d49520307068a47e8944c44aa3d /git-merge.html | |
| parent | a70c988a0584e1197ffd19b26c28e9790da32363 (diff) | |
| download | git-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz | |
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index e08fcfa9a..ea93660f2 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1975,6 +1975,11 @@ gvimdiff </li>
<li>
<p>
+gvimdiff1
+</p>
+</li>
+<li>
+<p>
gvimdiff2
</p>
</li>
@@ -2000,6 +2005,11 @@ nvimdiff </li>
<li>
<p>
+nvimdiff1
+</p>
+</li>
+<li>
+<p>
nvimdiff2
</p>
</li>
@@ -2040,6 +2050,11 @@ vimdiff </li>
<li>
<p>
+vimdiff1
+</p>
+</li>
+<li>
+<p>
vimdiff2
</p>
</li>
|