diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
| commit | 3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5 (patch) | |
| tree | 49e1d04b52edbaa0b3d2fc549ad3cdbe30f9e1ee /git-mergetool.html | |
| parent | ba7fe50148ec50de8394e1fe0f672c47bf6d4c17 (diff) | |
| download | git-htmldocs-3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5.tar.gz | |
Autogenerated HTML docs for v1.8.3-rc3
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index 09fcc21a0..e9cddc918 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -746,7 +746,7 @@ git-mergetool(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git mergetool</em> [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>…]</pre>
+<pre class="content"><em>git mergetool</em> [--tool=<tool>] [-y | --[no-]prompt] [<file>…]</pre>
<div class="attribution">
</div></div>
</div>
@@ -863,7 +863,7 @@ are successfully merged.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-08-27 14:06:30 PDT
+Last updated 2013-05-17 16:33:07 PDT
</div>
</div>
</body>
|