Subversion Repositories spk

Rev

Rev 1 | Rev 58 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1 Rev 52
Line 170... Line 170...
170 
			{
 170 
			{
171 
				for ( SStringList *str = list->Head(); str; str = str->next )
 171 
				for ( SStringList *str = list->Head(); str; str = str->next )
172 
				{
 172 
				{
173 
					int status = str->data.ToInt();
 173 
					int status = str->data.ToInt();
174 
					if ( status == 2 ) // in 2nd mod
 174 
					if ( status == 2 ) // in 2nd mod
175 
						CatFile.AppendFile(CyStringFromSystemString(this->textBox2->Text) + "::" + str->str, str->str);
 175 
						CatFile.AppendFile(_S(this->textBox2->Text) + "::" + str->str.ToString(), str->str.ToString());
176 
					// finally, we need to diff the remaining files
 176 
					// finally, we need to diff the remaining files
177 
					else if ( status == -1 ) // in both
 177 
					else if ( status == -1 ) // in both
178 
					{
 178 
					{
179 
						// only diffable files, we ignore the rest
 179 
						// only diffable files, we ignore the rest
180 
						if ( CModDiff::CanBeDiffed(str->str) )
 180 
						if ( CModDiff::CanBeDiffed(str->str) )