Manual:$wgDiff3
From Linux Web Expert
<translate> Edit user interface</translate>: $wgDiff3 | |
---|---|
Path to the GNU diff3 utility. |
|
<translate> Introduced in version:</translate> | 1.3.0 |
<translate> Removed in version:</translate> | <translate> still in use</translate> |
<translate> Allowed values:</translate> | (absolute path) |
<translate> Default value:</translate> | '/usr/bin/diff3' |
<translate> Other settings:</translate> <translate> Alphabetical</translate> | <translate> By function</translate> |
Details
Path to the GNU diff3 utility. If the file doesn't exist, edit conflicts will fall back to the old behavior (no merging).