1<?php
2/**
3 * Options for the conflictmerger plugin
4 */
5
6$conf['diff3'] = '/usr/bin/diff3';       //Path to diff3 utility to automatically merge conflicts
7