LocalSettingsGenerator: Document $wgDiff3 in the generated LocalSettings.php

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 241da58..2893c7a 100644 (file)
--- 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