Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3

[git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f7be5846a67de1a3215bad3d7b9c263705cd1bba..af68d694a0ad8066b05fcc02bae8e57a7c137034 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
 --------
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...

-       [-m <msg>] <remote> <remote>...
+       [-m <msg>] <remote>...

 'git merge' <msg> HEAD <remote>...
 
 DESCRIPTION
 'git merge' <msg> HEAD <remote>...
 
 DESCRIPTION


@@ -40,8 +40,8 @@ include::merge-options.txt[]
 include::merge-strategies.txt[]
 
 
 include::merge-strategies.txt[]
 
 

-If you tried a merge which resulted in a complex conflicts and
-would want to start over, you can recover with 'git-reset'.
+If you tried a merge which resulted in complex conflicts and
+want to start over, you can recover with 'git-reset'.

 
 CONFIGURATION
 -------------
 
 CONFIGURATION
 -------------


@@ -146,7 +146,7 @@ And here is another line that is cleanly resolved or unmodified.
 ------------
 
 The area where a pair of conflicting changes happened is marked with markers
 ------------
 
 The area where a pair of conflicting changes happened is marked with markers

-"`<<<<<<<`", "`=======`", and "`>>>>>>>`".  The part before the "`=======`"
+`<<<<<<<`, `=======`, and `>>>>>>>`.  The part before the `=======`

 is typically your side, and the part afterwards is typically their side.
 
 The default format does not show what the original said in the conflicting
 is typically your side, and the part afterwards is typically their side.
 
 The default format does not show what the original said in the conflicting


@@ -173,8 +173,8 @@ Git makes conflict resolution easy.
 And here is another line that is cleanly resolved or unmodified.
 ------------
 
 And here is another line that is cleanly resolved or unmodified.
 ------------
 

-In addition to the "`<<<<<<<`", "`=======`", and "`>>>>>>>`" markers, it uses
-another "`|||||||`" marker that is followed by the original text.  You can
+In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses
+another `|||||||` marker that is followed by the original text.  You can

 tell that the original just stated a fact, and your side simply gave in to
 that statement and gave up, while the other side tried to have a more
 positive attitude.  You can sometimes come up with a better resolution by
 tell that the original just stated a fact, and your side simply gave in to
 that statement and gave up, while the other side tried to have a more
 positive attitude.  You can sometimes come up with a better resolution by