Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c	(revision 8657)
+++ subversion/clients/cmdline/main.c	(working copy)
@@ -518,18 +518,20 @@
     "    First column: Says if item was added, deleted, or otherwise changed\n"
     "      ' ' no modifications\n"
     "      'A' Added\n"
+    "      'C' Conflicted\n"
     "      'D' Deleted\n"
+    "      'G' Merged\n"
+    "      'I' Ignored\n"
     "      'M' Modified\n"
-    "      'C' Conflicted\n"
-    "      'I' Ignored\n"
+    "      'R' Replaced\n"
     "      'X' item is unversioned, but is used by an externals definition\n"
     "      '?' item is not under version control\n"
     "      '!' item is missing (removed by non-svn command) or incomplete\n"
     "      '~' versioned item obstructed by some item of a different kind\n"
     "    Second column: Modifications of a file's or directory's properties\n"
     "      ' ' no modifications\n"
+    "      'C' Conflicted\n"
     "      'M' Modified\n"
-    "      'C' Conflicted\n"
     "    Third column: Whether the working copy directory is locked\n"
     "      ' ' not locked\n"
     "      'L' locked\n"