<?php
/**
 * Options for the conflictmerger plugin
 */

$conf['diff3'] = '/usr/bin/diff3';       //Path to diff3 utility to automatically merge conflicts