diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-10-25 04:32:16 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-10-25 04:32:16 +0200 |
| commit | 09a1b9abb5b7e57ddfbb0e3a2789a924237277ba (patch) | |
| tree | cf239f98b20ff504ed2f73b3caf65c6c70bb6bc0 /using-git.texinfo | |
| parent | the default remote is named origin (diff) | |
| download | using-git-09a1b9abb5b7e57ddfbb0e3a2789a924237277ba.tar.gz using-git-09a1b9abb5b7e57ddfbb0e3a2789a924237277ba.tar.bz2 using-git-09a1b9abb5b7e57ddfbb0e3a2789a924237277ba.tar.xz | |
typo
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | using-git.texinfo | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index 13e8107..dd4a27a 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -778,7 +778,7 @@ to. This done my adding the option: To get the message ID, open the message in your e-mail client and choose to see all headers --- if not possible: download the it as an mbox file -and open it in an text editor --- a look for: +and open it in a text editor --- a look for: @example Message-ID: <MESSAGE_ID> @@ -1784,7 +1784,7 @@ and in fact it is text based, more precisely it is XML based. Will you may not be able to view an SVG file with merge conflicts, you are still able to -open it in an text editor and fix the conficts. +open it in a text editor and fix the conficts. However it may not be the simplest thing to resolve in a text editor it helps you to identify where the conflicts are located in the graphics. |