Mercurial > hg > Game > Cerium

diff example/regex/WordCount.h @ 1204:ffef576db4b3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify example/regex/
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Sat, 16 Jul 2011 17:25:40 +0900
parents 7b866a392adc
children
line wrap: on
line diff
--- a/example/regex/WordCount.h	Thu Jul 14 18:57:43 2011 +0900
+++ b/example/regex/WordCount.h	Sat Jul 16 17:25:40 2011 +0900
@@ -17,21 +17,9 @@
     int file_size;
     HTaskPtr t_print;
 
-<<<<<<< local
-
-=======
   //regexのENVの成分
->>>>>>> other
   bool print_count;
   bool print_filename;
   int count;
   char *filename;
-<<<<<<< local
 } WordCount, ENV, *ENVP; 
-
-
-=======
-}WordCount;
-  //} WordCount, ENV;
-//typedef ENV *ENVP;
->>>>>>> other