Differences From:

File src/diffcmd.c part of check-in [57b2735ebd] - Enhanced text diff subroutine uses Myers enhancements to Wagners minimum edit distance algorithm. White space at the end of lines is ignored. by drh on 2007-11-15 21:49:14. [view]

To:

File src/diffcmd.c part of check-in [371dd6574c] - Fix the revert command so that it works from subdirectories. Other minor comment and help-text changes. by drh on 2007-12-04 01:26:21. Also file src/diffcmd.c part of check-in [d0305b305a] - Merged mainline into my branch to get the newest application. by aku on 2007-12-05 08:07:46. [view]

@@ -45,9 +45,9 @@
 /*
 ** COMMAND: diff
 ** COMMAND: gdiff
 **
-** Usage: %fossil diff|gdiff ?-i ?-r REVISION FILE...
+** Usage: %fossil diff|gdiff ?-i? ?-r REVISION? FILE...
 **
 ** Show the difference between the current version of a file (as it
 ** exists on disk) and that same file as it was checked out.
 **
@@ -60,16 +60,16 @@
 ** diff command will be executed.
 **
 ** Here are a few external diff command settings, for example:
 **
-**   %fossil config diff-command=diff
+**   %fossil setting diff-command diff
 **
-**   %fossil config gdiff-command=tkdiff
-**   %fossil config gdiff-command=eskill22
-**   %fossil config gdiff-command=tortoisemerge
-**   %fossil config gdiff-command=meld
-**   %fossil config gdiff-command=xxdiff
-**   %fossil config gdiff-command=kdiff3
+**   %fossil setting gdiff-command tkdiff
+**   %fossil setting gdiff-command eskill22
+**   %fossil setting gdiff-command tortoisemerge
+**   %fossil setting gdiff-command meld
+**   %fossil setting gdiff-command xxdiff
+**   %fossil setting gdiff-command kdiff3
 */
 void diff_cmd(void){
   const char *zFile, *zRevision;
   Blob cmd;
@@ -117,9 +117,9 @@
       fossil_panic("no history for file: %b", &fname);
     }
     content_get(rid, &record);
   }else{
-    content_get_historical_file(zRevision, zFile, &record);
+    historical_version_of_file(zRevision, zFile, &record);
   }
   if( internalDiff==1 ){
     Blob out;
     Blob current;