[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository CVS.pm,1.29,1.30

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv18281/lib/SandWeb/Repository

Modified Files:
	CVS.pm 
Log Message:
technically this should be "locally modified", not "merged".


Index: CVS.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/CVS.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- CVS.pm	25 Feb 2002 23:52:24 -0000	1.29
+++ CVS.pm	8 Mar 2002 22:20:42 -0000	1.30
@@ -532,5 +532,5 @@
 	foreach my $line (@raw_output) {
 		if ($line =~ /^M/) {
-			$line =~ s/^M/\<font color\=\"blue\"\>Merged\<\/font\>/;
+			$line =~ s/^M/\<font color\=\"blue\"\>Locally modified\<\/font\>/;
 		} 
 		elsif ($line =~ /^U/) {