SHA1 Hash:	29bc8da1d925784830a363ca3d04af5810275c16
Date:	2007-10-10 03:39:04
User:	jnc
Comment:	Added diff-command and gdiff-command to the valid settings
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/db.c from [61d4843c1d] to [9ee28c7627].

@@ -992,19 +992,27 @@
 **                     commit with gpg. All commits will be unsigned.
 **
 **    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",
     "clearsign",
     "editor",
     "localauth",
     "omitsign",
     "safemerge",
+    "diff-command",
+    "gdiff-command",
   };
   int i;
   int globalFlag = find_option("global","g",0)!=0;
   db_find_and_open_repository();
   if( g.argc==2 ){

Modified src/diffcmd.c from [4cfcd3d811] to [637be09787].