Manual:$wgDiff3

From MediaWiki.org

Jump to: navigation, search
Paths: $wgDiff3
Path to the GNU diff3 utility.
Introduced in version: 1.3.0
Removed in version: still in use
Allowed Values: absolute path
Default Value: '/usr/bin/diff3'

Other settings: Alphabetical | By Function


[edit] Details

Path to the GNU diff3 utility. If the file doesn't exist, edit conflicts will fall back to the old behaviour (no merging).