diff options
Diffstat (limited to 'man1/git-merge.1')
| -rw-r--r-- | man1/git-merge.1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 70c3e5101..20d295e50 100644 --- a/man1/git-merge.1 +++ b/man1/git-merge.1 @@ -2,12 +2,12 @@ .\" Title: git-merge .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -609,7 +609,7 @@ You can work through the conflict with a number of tools: .\} Use a mergetool\&. \fBgit mergetool\fR -to launch a graphical mergetool which will work you through the merge\&. +to launch a graphical mergetool which will work through the merge with you\&. .RE .sp .RS 4 @@ -965,7 +965,7 @@ marker\&. An alternate style, "diff3", adds a \fB|||||||\fR marker and the original text before the \fB=======\fR -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 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 the beginning or end of a conflict region\&. +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 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 the beginning or end of a conflict region\&. .RE .PP merge\&.defaultToUpstream |