[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/classify.c
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/classify.c |
Date: |
Thu, 22 Sep 2005 23:41:57 -0400 |
Index: ccvs/src/classify.c
diff -u ccvs/src/classify.c:1.36 ccvs/src/classify.c:1.37
--- ccvs/src/classify.c:1.36 Fri Sep 23 03:19:22 2005
+++ ccvs/src/classify.c Fri Sep 23 03:41:56 2005
@@ -324,7 +324,7 @@
#else
/* Files with conflict markers and new timestamps fall through
* here, but they need to. T_CONFLICT is an error in
- * commit_fileproc, whereas T_CONFLICT with conflict markers
+ * commit_fileproc, whereas T_MODIFIED with conflict markers
* is caught but only warned about. Similarly, update_fileproc
* currently reregisters a file that was conflicted but lost
* its markers.