diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 13:07:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 13:07:39 -0700 |
| commit | 2a4bcbc355496c8d83b1b9f8892c4cbe8f584158 (patch) | |
| tree | 4638d4f635a65f08e49c31d27c9d27f09900e756 /git-merge.html | |
| parent | d2c2848ee5eb75b65de6b667b52c9235903013f7 (diff) | |
| download | git-htmldocs-2a4bcbc355496c8d83b1b9f8892c4cbe8f584158.tar.gz | |
Autogenerated HTML docs for v2.1.3-590-g3666
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 1dd2f0959..61aea9c8b 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1659,6 +1659,11 @@ araxis </li>
<li>
<p>
+bc
+</p>
+</li>
+<li>
+<p>
bc3
</p>
</li>
|