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-merge.html | |
| parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
| download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz | |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge.html b/git-merge.html index ade5c345e..d5dda7ff8 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1455,7 +1455,7 @@ Resolve the conflicts. Git will mark the conflicts in <li>
<p>
Use a mergetool. <code>git mergetool</code> to launch a graphical
- mergetool which will work you through the merge.
+ mergetool which will work through the merge with you.
</p>
</li>
<li>
@@ -1819,7 +1819,7 @@ merge.conflictStyle marker and the original text before the <code>=======</code> marker. The
"merge" style tends to produce smaller conflict regions than diff3,
both because of the exclusion of the original text, and because
- when a subset of lines match on the two sides they are just pulled
+ when a subset of lines match on the two sides, they are just pulled
out of the conflict region. Another alternate style, "zdiff3", is
similar to diff3 but removes matching lines on the two sides from
the conflict region when those matching lines appear near either
@@ -2336,7 +2336,7 @@ merge.<driver>.recursive <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
|