|
From: Hasnain A. <has...@us...> - 2006-09-19 11:00:52
|
Update of /cvsroot/hello-world/myproject1 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31807 Modified Files: file1 file2 main.c Log Message: commiting changes on date 19-09-2006 Index: file2 =================================================================== RCS file: /cvsroot/hello-world/myproject1/file2,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** file2 14 Feb 2006 11:24:45 -0000 1.2 --- file2 19 Sep 2006 11:00:45 -0000 1.3 *************** *** 2,4 **** ! Second line added on 14-02-2006 --- 2,7 ---- ! second line added on 14-02-2006 ! ! third line added on 19-09-2006 ! Index: main.c =================================================================== RCS file: /cvsroot/hello-world/myproject1/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 6 Jan 2006 07:56:17 -0000 1.3 --- main.c 19 Sep 2006 11:00:46 -0000 1.4 *************** *** 11,18 **** cvs (); ! //both changes merged return 0; } void cvs (void) { --- 11,20 ---- cvs (); ! //both changes merged return 0; } + + void cvs (void) { *************** *** 21,22 **** --- 23,25 ---- } + // ---------comment added on 19-09-2006---- Index: file1 =================================================================== RCS file: /cvsroot/hello-world/myproject1/file1,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** file1 14 Feb 2006 11:17:01 -0000 1.2 --- file1 19 Sep 2006 11:00:45 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + -----------added 19-9-2006- abc *************** *** 9,10 **** --- 10,15 ---- date added 14-02-2006 + + -----------added 19-9-2006- + + |