Home
last modified time | relevance | path

Searched path:conflictmerger (Results 1 – 13 of 13) sorted by relevance

/plugin/conflictmerger/
H A DCOPYING
H A DVERSION
H A Daction.php
/plugin/conflictmerger/conf/
H A Ddefault.php
H A Dmetadata.php
/plugin/conflictmerger/lang/en/
H A Dconflict-solved.txt
H A Dconflict-unsolved.txt
H A Dsettings.php
/plugin/conflictmerger/lang/es/
H A Dconflict-solved.txt
H A Dconflict-unsolved.txt
H A Dsettings.php
/plugin/conflictmerger/tests/
H A Dacceptance.test.php
H A Dmerge.test.php