Beginnings of visual conflict resolution
author Maxious
()
committer Maxious
()
commit 2b921f90255f3b989b7ec071e310ebfe9dff3650
tree d0ee61624a5e62ffb67373d9f9052d37a05d8ad9
parent 15098a9c68ce40f96d805a3efbebe3832c67e61c
Beginnings of visual conflict resolution


Former-commit-id: f8dfd63919aab30a6b99f6861e80a36b55f5af04
.gitmodules
admin/import.php
admin/resolveConflicts.php [ new file with mode 0644 ]
admin/verify.php
include/common.inc.php
include/template.inc.php
lib/php-diff [ new directory with mode 0000 ]