From 71922af496fd701f0c103850403576aa65b2e42a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 8 Apr 2015 21:49:22 +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 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 -- cgit v1.2.3-70-g09d2