[Cvs-cvs] Changes to ccvs/src/commit.c

[Derek Robert Price]

Index: ccvs/src/commit.c
diff -u ccvs/src/commit.c:1.255 ccvs/src/commit.c:1.256
--- ccvs/src/commit.c:1.255     Fri Sep 23 03:19:23 2005
+++ ccvs/src/commit.c   Fri Oct 28 22:41:50 2005
@@ -894,7 +894,8 @@
                       finfo->fullname);
                goto out;
            }
-           if (status == T_MODIFIED && !force_ci && file_has_markers (finfo))
+           if (status == T_MODIFIED && !force_ci && !really_quiet
+               && file_has_markers (finfo))
            {
                /* Make this a warning, not an error, because we have
                   no way of knowing whether the "conflict indicators"