diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-13 15:01:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 15:01:41 -0700 |
| commit | 5996b6708bc4458944b9a352131bf882bedd1535 (patch) | |
| tree | edd298d85f738b1ebc56585b3503bc72b4a4754e /git-merge.html | |
| parent | 84ea1e42221ac3bab88dda1a6ee25a11802cfef9 (diff) | |
| download | git-htmldocs-5996b6708bc4458944b9a352131bf882bedd1535.tar.gz | |
Autogenerated HTML docs for v2.8.1-185-gdc0db
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index c220e0359..c53a382d6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1750,6 +1750,11 @@ emerge </li>
<li>
<p>
+examdiff
+</p>
+</li>
+<li>
+<p>
gvimdiff
</p>
</li>
|