From 29ac1980b388feaea7417b8f5311015dadac1ef0 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 19 Sep 2013 17:33:20 +0200 Subject: typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3-70-g09d2