aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2015-04-08 21:49:22 +0200
committerMattias Andrée <maandree@operamail.com>2015-04-08 21:49:22 +0200
commit71922af496fd701f0c103850403576aa65b2e42a (patch)
treee8a2974be1b0c9c45f52670fe75c128eb825b5f8 /using-git.texinfo
parenttypo (diff)
downloadusing-git-71922af496fd701f0c103850403576aa65b2e42a.tar.gz
using-git-71922af496fd701f0c103850403576aa65b2e42a.tar.bz2
using-git-71922af496fd701f0c103850403576aa65b2e42a.tar.xz
typo
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 8f7f7be..255e3a2 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -1985,7 +1985,7 @@ but that is really what it is called.} Graphics
(SVG) is the most popular vector image format,
and in fact it is text based, more precisely
it is XML based.
-Will you may not be able to view an SVG file
+While you may not be able to view an SVG file
with merge conflicts, you are still able to
open it in a text editor and fix the conficts.
However it may not be the simplest thing to