Merging


Änderungen zwischen einzelnen Branches übernehmen

michael@zaphod:~/checkouts/Office> cvs update -j Office_1 Makefile 
RCS file: /home/michael/cvs/Office/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into Makefile

michael@zaphod:~/checkouts/Office> cvs diff Makefile 
Index: Makefile
===================================================================
RCS file: /home/michael/cvs/Office/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile    28 Feb 2002 12:54:39 -0000      1.2
+++ Makefile    28 Feb 2002 13:43:48 -0000
@@ -1,5 +1,7 @@
-vi:
-       $(CC) -o vi vi.c
+CFLAGS=                -O2 -Wall
+
+vi: vi.c
+       $(CC) $(CFLAGS) -o vi vi.c
 
 clean:
        rm -f vi