summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-07-06 09:52:17 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-07-06 09:52:17 +0000
commitfa0bb594d90e4d31d61c81bcb98a03257c0c1301 (patch)
tree6c47931250fa4d01ae57246ce3e3a44aa981bf0f /usr.bin
parente415825626eaa5e1dae7f71106e93d66f1d4d123 (diff)
correct file status strings;
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/status.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c
index 90278d52fbf..fc205c39bd1 100644
--- a/usr.bin/cvs/status.c
+++ b/usr.bin/cvs/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.28 2005/07/05 16:14:47 xsa Exp $ */
+/* $OpenBSD: status.c,v 1.29 2005/07/06 09:52:16 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -47,9 +47,9 @@ const char *cvs_statstr[] = {
"Unknown",
"Up-to-date",
"Locally Modified",
- "Added",
- "Removed",
- "Conflict",
+ "Locally Added",
+ "Locally Removed",
+ "Unresolved Conflict",
"Patched",
"Needs Checkout",
};