diff options
Diffstat (limited to 'man1/git-merge.1')
| -rw-r--r-- | man1/git-merge.1 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/man1/git-merge.1 b/man1/git-merge.1 index c85993de8..28cc95cbe 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: 03/21/2023 +.\" Date: 03/28/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.130.g27d43aaaf5 +.\" Source: Git 2.40.0.141.g8d90352acc .\" Language: English .\" -.TH "GIT\-MERGE" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GIT\-MERGE" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -478,7 +478,7 @@ ancestor, or cleanly resolved because only one side changed, or cleanly resolved because both sides changed the same way\&. <<<<<<< yours:sample\&.txt Conflict resolution is hard; -let\(aqs go shopping\&. +let\*(Aqs go shopping\&. ======= Git makes conflict resolution easy\&. >>>>>>> theirs:sample\&.txt @@ -504,7 +504,7 @@ ancestor, or cleanly resolved because only one side changed, <<<<<<< yours:sample\&.txt or cleanly resolved because both sides changed the same way\&. Conflict resolution is hard; -let\(aqs go shopping\&. +let\*(Aqs go shopping\&. ||||||| base:sample\&.txt or cleanly resolved because both sides changed identically\&. Conflict resolution is hard\&. @@ -530,7 +530,7 @@ ancestor, or cleanly resolved because only one side changed, or cleanly resolved because both sides changed the same way\&. <<<<<<< yours:sample\&.txt Conflict resolution is hard; -let\(aqs go shopping\&. +let\*(Aqs go shopping\&. ||||||| base:sample\&.txt or cleanly resolved because both sides changed identically\&. Conflict resolution is hard\&. @@ -1096,7 +1096,7 @@ Use ECMerge (requires a graphical session) .PP \fBemerge\fR .RS 4 -Use Emacs\(aq Emerge +Use Emacs\*(Aq Emerge .RE .PP \fBexamdiff\fR @@ -1112,7 +1112,7 @@ Use Guiffy\(cqs Diff Tool (requires a graphical session) \fBgvimdiff\fR .RS 4 Use gVim (requires a graphical session) with a custom layout (see -\fBgit help mergetool\fR\(aqs +\fBgit help mergetool\fR\*(Aqs \fBBACKEND SPECIFIC HINTS\fR section) .RE @@ -1142,7 +1142,7 @@ Use KDiff3 (requires a graphical session) Use Meld (requires a graphical session) with optional \fBauto merge\fR (see -\fBgit help mergetool\fR\(aqs +\fBgit help mergetool\fR\*(Aqs \fBCONFIGURATION\fR section) .RE @@ -1150,7 +1150,7 @@ section) \fBnvimdiff\fR .RS 4 Use Neovim with a custom layout (see -\fBgit help mergetool\fR\(aqs +\fBgit help mergetool\fR\*(Aqs \fBBACKEND SPECIFIC HINTS\fR section) .RE @@ -1198,7 +1198,7 @@ Use TortoiseMerge (requires a graphical session) \fBvimdiff\fR .RS 4 Use Vim with a custom layout (see -\fBgit help mergetool\fR\(aqs +\fBgit help mergetool\fR\*(Aqs \fBBACKEND SPECIFIC HINTS\fR section) .RE |