aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 5224a70..6ba8409 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -547,7 +547,7 @@ git merge MERGEE
If you two cannot be automatically merged,
you will get a merge conflict. A case
where you will get merge conflicts is when
-one of the branches as made a modification
+one of the branches has made a modification
where the other has change the indention,
so keep to a coding style from the start;
or both has edited the same lines.