From 5a37b39e385d4987cbe2b369e809f920846df61c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sun, 4 Jul 2010 22:11:18 +0000 Subject: [PATCH] LocalSettingsGenerator: Document $wgDiff3 in the generated LocalSettings.php --- includes/installer/LocalSettingsGenerator.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index 241da58475..2893c7a4cc 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -256,6 +256,7 @@ if ( \$wgCommandLineMode ) { \$wgRightsIcon = \"{$this->values['wgRightsIcon']}\"; # \$wgRightsCode = \"{$this->values['wgRightsCode']}\"; # Not yet used +# Path to the GNU diff3 utility. Used for conflict resolution. \$wgDiff3 = \"{$this->values['wgDiff3']}\"; # When you make changes to this configuration file, this will make -- 2.20.1