diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-19 17:33:20 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-19 17:33:20 +0200 |
| commit | 29ac1980b388feaea7417b8f5311015dadac1ef0 (patch) | |
| tree | ba93fe25aeb6938a5304585987953651a6371fe5 /using-git.texinfo | |
| parent | typo (diff) | |
| download | using-git-29ac1980b388feaea7417b8f5311015dadac1ef0.tar.gz using-git-29ac1980b388feaea7417b8f5311015dadac1ef0.tar.bz2 using-git-29ac1980b388feaea7417b8f5311015dadac1ef0.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 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: |