diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-15 11:40:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-15 11:40:25 -0700 |
| commit | 369e340f234cf9372003f0e912c6fa14f3e970fc (patch) | |
| tree | 7f0c2cdeb1043a4a25b65d721220eac32af407f1 /git-merge.html | |
| parent | 79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8 (diff) | |
| download | git-htmldocs-369e340f234cf9372003f0e912c6fa14f3e970fc.tar.gz | |
Autogenerated HTML docs for v1.8.4-554-g2b7ca9
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 4014d8410..9f5509b7f 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1655,6 +1655,11 @@ deltawalker </li>
<li>
<p>
+diffmerge
+</p>
+</li>
+<li>
+<p>
diffuse
</p>
</li>
|