[Cvs-cvs] Changes to ccvs/src/status.c [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/status.c
diff -u ccvs/src/status.c:1.50.4.6 ccvs/src/status.c:1.50.4.7
--- ccvs/src/status.c:1.50.4.6  Fri Sep  2 19:37:35 2005
+++ ccvs/src/status.c   Thu Sep 22 18:13:28 2005
@@ -146,9 +146,6 @@
            sstat = "Needs Patch";
            break;
        case T_CONFLICT:
-           /* I _think_ that "unresolved" is correct; that if it has
-              been resolved then the status will change.  But I'm not
-              sure about that.  */
            sstat = "Unresolved Conflict";
            break;
        case T_ADDED:
@@ -158,9 +155,7 @@
            sstat = "Locally Removed";
            break;
        case T_MODIFIED:
-           if ( vers->ts_conflict
-                && ( file_has_conflict ( finfo, vers->ts_conflict )
-                      || file_has_markers ( finfo ) ) )
+           if (file_has_markers (finfo))
                sstat = "File had conflicts on merge";
            else
                /* Note that we do not re Register() the file when we spot