diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-19 17:31:01 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-19 17:31:01 +0200 |
| commit | 1fbe9b19cdd12bfc8aac243f5ca38e61aa20eb87 (patch) | |
| tree | 6476281ee1cc062a854f295abfd575454ad4c418 /using-git.texinfo | |
| parent | add a footnote to say the git push pushes more than the branch (diff) | |
| download | using-git-1fbe9b19cdd12bfc8aac243f5ca38e61aa20eb87.tar.gz using-git-1fbe9b19cdd12bfc8aac243f5ca38e61aa20eb87.tar.bz2 using-git-1fbe9b19cdd12bfc8aac243f5ca38e61aa20eb87.tar.xz | |
typo
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -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, |