diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
| commit | bd53dbff51079dc26ea27b00d94b28a5229c0fec (patch) | |
| tree | ed0a78743f67e293b2302e91fefa24e6e579c428 /git-mergetool.html | |
| parent | 4efe0e79bcead21602c1f6669f07d4739358ca1a (diff) | |
| download | git-htmldocs-bd53dbff51079dc26ea27b00d94b28a5229c0fec.tar.gz | |
Autogenerated HTML docs for v1.6.1-203-ga83c8
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index a94269f82..e0454ec7d 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -335,7 +335,10 @@ with merge conflicts.</p></div> <div class="sectionbody">
<div class="vlist"><dl>
<dt>
--t or --tool=<tool>
+-t <tool>
+</dt>
+<dt>
+--tool=<tool>
</dt>
<dd>
<p>
@@ -373,7 +376,10 @@ 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>
--y or --no-prompt
+-y
+</dt>
+<dt>
+--no-prompt
</dt>
<dd>
<p>
@@ -407,7 +413,7 @@ success of the resolution after the custom tool has exited.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-01-01 22:04:58 UTC
+Last updated 2009-01-18 18:26:22 UTC
</div>
</div>
</body>
|