Differences From:

File src/db.c part of check-in [a21806dcf3] - Fixed omitsign discrepancies. Windows version now looks for USERNAME instead of USER when creating new database. by jnc on 2007-10-07 14:38:54. [view]

To:

File src/db.c part of check-in [29bc8da1d9] - Added diff-command and gdiff-command to the valid settings by jnc on 2007-10-10 03:39:04. [view]

@@ -993,8 +993,14 @@
 **
 **    safemerge        If enabled, when commit will cause a fork, the
 **                     commit will not abort with warning. Also update
 **                     will not be allowed if local changes exist.
+**
+**   diff-command      External command to run when performing a diff.
+**                     If undefined, the internal text diff will be used.
+**
+**   gdiff-command     External command to run when performing a graphical
+**                     diff. If undefined, text diff will be used.
 */
 void setting_cmd(void){
   static const char *azName[] = {
     "autosync",
@@ -1002,8 +1008,10 @@
     "editor",
     "localauth",
     "omitsign",
     "safemerge",
+    "diff-command",
+    "gdiff-command",
   };
   int i;
   int globalFlag = find_option("global","g",0)!=0;
   db_find_and_open_repository();