From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 10 Nov 2014 22:31:19 +0000 (-0500)
Subject: Typo fixes.
X-Git-Tag: 0.4~2
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=d95dbb7f075fcc3b5fa21c44b76de8bc28ccc54b;p=src.git

Typo fixes.
---

diff --git a/src b/src
index 51c9126..cf4a0c6 100755
--- a/src
+++ b/src
@@ -26,7 +26,7 @@
 #
 # Top of the list of things that people will bikeshed about is the
 # letter codes returned by src status. Different VCSes have
-# cinflicting ideas about this. The universal ones are A = Added, M =
+# conflicting ideas about this. The universal ones are A = Added, M =
 # Modified, and ? = Untracked.  Here's a table of the ones in dispute.
 # Entries with '-' mean the VCS does not have a closely corresponding
 # status.
@@ -39,14 +39,14 @@
 # Ignored           '!'     'I'    'I'      'I'
 # Updated/unmerged  'U'      -      -        -
 # Missing            -      '!'    '!'      '!'
-# Locked             -       -      -       'L'
+# Locked             -       -     'L'      'L'
 #
 # This is a bit oversimplified; it is meant not as a technical comparison
 # but rather to illustrate how bad the letter collisions are. SRC follows
 # the majority except for absolutely *not* using a space as a status code;
-# this makes the reports too hard to machine-parse. Thecdesigner judged that
-# the semantic collisiion wuth git's U was less bad than sucggesting that and
-# unmofied file had been copied.
+# this makes the reports too hard to machine-parse. The designer judged that
+# the semantic collisiion with git's U was less bad than suggesting that an
+# unmodified file had been copied.
 
 import sys, os, subprocess, time, calendar, stat, glob, shutil