diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 16:24:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 16:24:30 -0700 |
commit | 778a3411f5a5c0dd8a7a6bb51c9451590ad706cb (patch) | |
tree | c10dd41f6ceecd0a2692f5d2694cb2e9b660f331 /git-difftool.html | |
parent | 09cfe6f8345e8ab347de8af492c34b5850b9b409 (diff) | |
download | git-htmldocs-778a3411f5a5c0dd8a7a6bb51c9451590ad706cb.tar.gz |
Autogenerated HTML docs for v1.8.2-279-g631bc
Diffstat (limited to 'git-difftool.html')
-rw-r--r-- | git-difftool.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/git-difftool.html b/git-difftool.html index 5c3813dc1..c9e25b610 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -850,13 +850,12 @@ with custom merge tool commands and has the same value as <code>$MERGED</code>.< <dd>
<p>
<em>git difftool</em>'s default behavior is create symlinks to the
- working tree when run in <code>--dir-diff</code> mode.
+ working tree when run in <code>--dir-diff</code> mode and the right-hand
+ side of the comparison yields the same content as the file in
+ the working tree.
</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>Specifying `--no-symlinks` instructs 'git difftool' to create
-copies instead. `--no-symlinks` is the default on Windows.</code></pre>
-</div></div>
+<div class="paragraph"><p>Specifying <code>--no-symlinks</code> instructs <em>git difftool</em> to create copies
+instead. <code>--no-symlinks</code> is the default on Windows.</p></div>
</dd>
<dt class="hdlist1">
-x <command>
@@ -981,7 +980,7 @@ difftool.prompt <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-03-28 16:23:57 PDT
</div>
</div>
</body>
|