[Git] Add gitignore
[Sublime] Add sublime package file
[Test] Add test data for diff3
Enable processing of diff3 conflict types