diff options
Diffstat (limited to '')
| -rw-r--r-- | using-git.texinfo | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index 7440929..026b4a9 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -631,8 +631,8 @@ git fetch MERGEE && git merge MERGEE @end example -If you two cannot be automatically merged, -you will get a merge conflict. A case +If the two branches cannot be automatically +merged, you will get a merge conflict. A case where you will get merge conflicts is when one of the branches has made a modification where the other has change the indention, |