diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
| commit | a00504d4382d1ae561f4199e9d3bcf65a8045ecd (patch) | |
| tree | 02c2f48bdefba25f947ea52b29fdddda57f18f5d /git-mergetool.html | |
| parent | b9dc76c4ad0987d352a0d26620978a14e8f09714 (diff) | |
| download | git-htmldocs-a00504d4382d1ae561f4199e9d3bcf65a8045ecd.tar.gz | |
Autogenerated HTML docs for v1.7.12-116-g31e0100
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index d9964087b..79609515b 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -643,6 +643,14 @@ Otherwise, <em>git mergetool</em> will prompt the user to indicate the success of the resolution after the custom tool has exited.</p></div>
</dd>
<dt class="hdlist1">
+--tool-help
+</dt>
+<dd>
+<p>
+ Print a list of merge tools that may be used with <tt>--tool</tt>.
+</p>
+</dd>
+<dt class="hdlist1">
-y
</dt>
<dt class="hdlist1">
@@ -683,7 +691,7 @@ are successfully merged.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-07-24 15:05:00 PDT
+Last updated 2012-08-27 14:06:30 PDT
</div>
</div>
</body>
|