diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:33 -0800 |
| commit | 7887f9b4eb248358cc8e6937ceb87b9f072ce9e5 (patch) | |
| tree | d5670ef418f9f7d4a5780ee5d3d01696abb477aa /git-merge.html | |
| parent | d5cfc8f5a014ca40c71c8355aa37074cc885297e (diff) | |
| download | git-htmldocs-7887f9b4eb248358cc8e6937ceb87b9f072ce9e5.tar.gz | |
Autogenerated HTML docs for v2.30.0-335-ge63628
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index 761e32e78..e08fcfa9a 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1910,11 +1910,66 @@ merge.guitool <div class="ulist"><ul>
<li>
<p>
+araxis
+</p>
+</li>
+<li>
+<p>
+bc
+</p>
+</li>
+<li>
+<p>
bc3
</p>
</li>
<li>
<p>
+bc4
+</p>
+</li>
+<li>
+<p>
+codecompare
+</p>
+</li>
+<li>
+<p>
+deltawalker
+</p>
+</li>
+<li>
+<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
+diffuse
+</p>
+</li>
+<li>
+<p>
+ecmerge
+</p>
+</li>
+<li>
+<p>
+emerge
+</p>
+</li>
+<li>
+<p>
+examdiff
+</p>
+</li>
+<li>
+<p>
+guiffy
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>
@@ -1930,6 +1985,16 @@ gvimdiff3 </li>
<li>
<p>
+kdiff3
+</p>
+</li>
+<li>
+<p>
+meld
+</p>
+</li>
+<li>
+<p>
nvimdiff
</p>
</li>
@@ -1940,6 +2005,41 @@ nvimdiff2 </li>
<li>
<p>
+nvimdiff3
+</p>
+</li>
+<li>
+<p>
+opendiff
+</p>
+</li>
+<li>
+<p>
+p4merge
+</p>
+</li>
+<li>
+<p>
+smerge
+</p>
+</li>
+<li>
+<p>
+tkdiff
+</p>
+</li>
+<li>
+<p>
+tortoisemerge
+</p>
+</li>
+<li>
+<p>
+vimdiff
+</p>
+</li>
+<li>
+<p>
vimdiff2
</p>
</li>
@@ -1948,6 +2048,16 @@ vimdiff2 vimdiff3
</p>
</li>
+<li>
+<p>
+winmerge
+</p>
+</li>
+<li>
+<p>
+xxdiff
+</p>
+</li>
</ul></div>
</dd>
<dt class="hdlist1">
|