using "diff old new" is preferred master
authorAndrew Tridgell <tridge@samba.org>
Wed, 20 Apr 2011 11:24:40 +0000 (21:24 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 20 Apr 2011 11:24:40 +0000 (21:24 +1000)
lab2.php

index 80b26c9..43e2e4a 100644 (file)
--- a/lab2.php
+++ b/lab2.php
@@ -96,17 +96,16 @@ patch. You can either use the 'diff' tool, or you can use the builtin
 patch generation in a source code management tool if you used one to
 download the package. 
 
-
-<p>Here is the code for creating and working with your patch.
+<p>Here are the commands for creating and working with your patch.
 
 <p>Display the difference in code using diff command:
 <pre><b>
-  diff -up program.c program-update.c
+  diff -up program.c.old program.c
 </b></pre>
 
 <p>Creating a patch using diff command:
 <pre><b>
-  diff -up program.c program-update.c > somepatch.patch
+  diff -up program.c.old program.c > somepatch.patch
 </b></pre>
 
 <p>Producing difference statistics using the diffstat command: