Mercurial > hg > Game > Cerium

diff example/regex/WordCount.h @ 1200:7b866a392adc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mege 1179
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Thu, 14 Jul 2011 18:51:10 +0900
parents e55b9d2cb33e 2abd68a1ac2a
children ffef576db4b3
line wrap: on
line diff
--- a/example/regex/WordCount.h	Thu Jul 14 18:16:23 2011 +0900
+++ b/example/regex/WordCount.h	Thu Jul 14 18:51:10 2011 +0900
@@ -17,11 +17,21 @@
     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