SyncFiles method modified to detect conflicts as per #2096
-rw-r--r-- 982 .gitgnore
drwxr-xr-x - trunk