Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Viewing Differences: Fix typos

  • Loading branch information...
commit bd6bd1f6904709cb5ace1d56c189ceccfd97ddf6 1 parent 38e486b
@runpaint authored
Showing with 11 additions and 11 deletions.
  1. +11 −11 text/12_other-uses/03_viewing_differences_between_files.html
View
22 text/12_other-uses/03_viewing_differences_between_files.html
@@ -13,19 +13,19 @@ <h3 id="viewing-differences-between-files">Viewing Differences Between Files</h3
a file.</p>
<p>To diff from the command line invoke Vim as <tt>vimdiff</tt>, e.g.
-<tt>vimdiff -o <var>file1</var> <var>file2</var></tt>. To diff from within Vim
+<tt>:vimdiff -o <var>file1</var> <var>file2</var></tt>. To diff from within Vim
use <tt>:diffsplit <var>file</var></tt>.</p>
<p>The screen is split horizontally, and each file is shown in its own window.
-The differences between them are highlighted. Lines that exist in one buffer
-but not in By default, a line that exists in one file but not in another is
-coloured blue; the line in the other buffer that should have held this line is
-coloured green, and is called a 'filler' line. When a line exists in both
-buffers it is coloured purple. If characters inside the line differ they are
-highlighted in red. Identical lines have no highlighting. Identical runs of
-lines are <a href="#navigating-folds">folded</a>.</p>
-
-<p>To split the screen vertically use <tt>vimdif <var>file1</var>
+The differences between them are highlighted. By default, a line that exists
+in one file but not in another are coloured blue; the line in the other buffer
+that should have held this line is coloured green, and is called a
+<i>filler</i> line. When a line exists in both buffers it is coloured purple.
+If characters inside the line differ they are highlighted in red. Identical
+lines have no highlighting. Identical runs of lines are <a
+ href="#navigating-folds">folded</a>.</p>
+
+<p>To split the screen vertically use <tt>:vimdiff <var>file1</var>
<var>file2</var></tt> or <tt>:vert diffsplit <var>file1</var>
<var>file2</var></tt>.</p>
@@ -37,7 +37,7 @@ <h3 id="viewing-differences-between-files">Viewing Differences Between Files</h3
example, you write a file named <tt>grant-proposal.txt</tt>, then e-mail it to
somebody else for input. They make their changes and e-mail it back. You now
have two files: <tt>grant-proposal.txt</tt> and
-<tt>grant-proposal.changes.txt</tt>. You use <tt>vimdiff grant-proposal.txt
+<tt>grant-proposal.changes.txt</tt>. You use <tt>:vimdiff grant-proposal.txt
grant-proposal.changes.txt</tt> to see your collaborator's suggestions.</p>
<p>It's important to note, though, that diff only works with plain text files.
Please sign in to comment.
Something went wrong with that request. Please try again.