| Index: trunk/phase3/includes/installer/LocalSettingsGenerator.php |
| — | — | @@ -256,6 +256,7 @@ |
| 257 | 257 | \$wgRightsIcon = \"{$this->values['wgRightsIcon']}\"; |
| 258 | 258 | # \$wgRightsCode = \"{$this->values['wgRightsCode']}\"; # Not yet used |
| 259 | 259 | |
| | 260 | +# Path to the GNU diff3 utility. Used for conflict resolution. |
| 260 | 261 | \$wgDiff3 = \"{$this->values['wgDiff3']}\"; |
| 261 | 262 | |
| 262 | 263 | # When you make changes to this configuration file, this will make |