# HG changeset patch
# User kazz <kazz@cr.ie.u-ryukyu.ac.jp>
# Date 1266530145 -32400
# Node ID e200b5033233d09541d754ff0fa5d30bc595e9da
# Parent  ed1feeb6be1ef3b7a30f93e02199c70bf4f680b1# Parent  268c00a687149bbdb0a9cc8d02b6164107746c92
merged

diff -r ed1feeb6be1e -r e200b5033233 test1.txt
--- a/test1.txt	Fri Feb 19 06:54:27 2010 +0900
+++ b/test1.txt	Fri Feb 19 06:55:45 2010 +0900
@@ -1,6 +1,8 @@
 #include <stdio.h>
 
 void test() {
+    printf("hey\n");
+    printf("hello\n");
     return;
 }