diff options
Diffstat (limited to 'ex/HEAD/merge.html')
| -rw-r--r-- | ex/HEAD/merge.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ex/HEAD/merge.html b/ex/HEAD/merge.html index 4769c6898..5d89ab0dc 100644 --- a/ex/HEAD/merge.html +++ b/ex/HEAD/merge.html @@ -407,7 +407,7 @@ <span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span> <span class="p">}</span> - <span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_merge-16" class="fnlink" href="../../#HEAD/group/git2_merge/git_merge">git_merge</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> + <span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_merge-16" class="fnlink" href="../../#HEAD/group/merge/git_merge">git_merge</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="p">(</span><span class="k">const</span> <span class="n">git_annotated_commit</span> <span class="o">**</span><span class="p">)</span><span class="n">opts</span><span class="p">.</span><span class="n">annotated</span><span class="p">,</span> <span class="n">opts</span><span class="p">.</span><span class="n">annotated_count</span><span class="p">,</span> <span class="o">&</span><span class="n">merge_opts</span><span class="p">,</span> <span class="o">&</span><span class="n">checkout_opts</span><span class="p">);</span> <span class="n">check_lg2</span><span class="p">(</span><span class="n">err</span><span class="p">,</span> <span class="s">"merge failed"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> |