From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Sun, 4 Jul 2010 22:11:18 +0000 (+0000)
Subject: LocalSettingsGenerator: Document $wgDiff3 in the generated LocalSettings.php
X-Git-Tag: 1.31.0-rc.0~36260
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=5a37b39e385d4987cbe2b369e809f920846df61c;p=lhc%2Fweb%2Fwiklou.git

LocalSettingsGenerator: Document $wgDiff3 in the generated LocalSettings.php
---

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