diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
| commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
| tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-difftool.html | |
| parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
| download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz | |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-difftool.html b/git-difftool.html index 6f904f826..62858e6a9 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -807,7 +807,7 @@ to <em>git diff</em> and accepts the same options and arguments. See <dd>
<p>
Start showing the diff for the given path,
- the paths before it will move to end and output.
+ the paths before it will move to the end and output.
</p>
</dd>
<dt class="hdlist1">
@@ -867,7 +867,7 @@ with custom merge tool commands and has the same value as <code>$MERGED</code>.< </dt>
<dd>
<p>
- <em>git difftool</em>'s default behavior is create symlinks to the
+ <em>git difftool</em>'s default behavior is to create symlinks to the
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.
@@ -1055,7 +1055,7 @@ difftool.guiDefault <div id="footer">
<div id="footer-text">
Last updated
- 2023-04-17 21:53:20 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
|