http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69026
Revision: 69026
Author: avar
Date: 2010-07-04 22:11:18 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
LocalSettingsGenerator: Document $wgDiff3 in the generated LocalSettings.php
Modified Paths:
--------------
trunk/phase3/includes/installer/LocalSettingsGenerator.php
Modified: trunk/phase3/includes/installer/LocalSettingsGenerator.php
===================================================================
--- trunk/phase3/includes/installer/LocalSettingsGenerator.php 2010-07-04
22:11:14 UTC (rev 69025)
+++ trunk/phase3/includes/installer/LocalSettingsGenerator.php 2010-07-04
22:11:18 UTC (rev 69026)
@@ -256,6 +256,7 @@
\$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
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
