Manual:$wgDiff3
Edit user interface: $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 |
Details
editPath to the GNU diff3 utility. If the file doesn't exist, edit conflicts will fall back to the old behavior (no merging).