1<?php
2/**
3 * English language file
4 *
5 * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
6 * @author     Daniel Calviño Sánchez <danxuliu@gmail.com>
7 */
8
9$lang['diff3'] = 'Full path to diff3 command for automatic conflict merging';
10