diff options
| -rw-r--r-- | using-git.texinfo | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index b56b313..5224a70 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -545,7 +545,7 @@ git merge MERGEE @end example If you two cannot be automatically merged, -you will you get a merge conflict. A case +you will get a merge conflict. A case where you will get merge conflicts is when one of the branches as made a modification where the other has change the indention, |