summaryrefslogtreecommitdiffstats
path: root/git-difftool.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
commit92d80370646a0ce43b0c769027492b3c891090aa (patch)
treecee7315334fee3145cb4badcc7a400e3e763fbac /git-difftool.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-difftool.html')
-rw-r--r--git-difftool.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-difftool.html b/git-difftool.html
index ff11fb615..c9aab8a83 100644
--- a/git-difftool.html
+++ b/git-difftool.html
@@ -894,7 +894,7 @@ instead. <code>--no-symlinks</code> is the default on Windows.</p></div>
invoked diff tool returns a non-zero exit code.
</p>
<div class="paragraph"><p><em>git-difftool</em> will forward the exit code of the invoked tool when
-<em>--trust-exit-code</em> is used.</p></div>
+<code>--trust-exit-code</code> is used.</p></div>
</dd>
</dl></div>
<div class="paragraph"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
@@ -1001,7 +1001,7 @@ difftool.trustExitCode
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-10-29 13:07:00 PDT
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>