aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 6ba8409..0a89b79 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -557,7 +557,7 @@ you so, in which files there are conflicts,
and exit with the return code 1 to indicated
that the merge was not successful and human
intervention is required. If the merger
-branch as a file with the line
+branch has a file with the line
@code{Hello world} and the mergee branch
as the line @code{hello world!}, the
file will contain: