diff options
Diffstat (limited to 'tests/deletefile_fixtures/osctest/conflict/.osc/merge')
| -rw-r--r-- | tests/deletefile_fixtures/osctest/conflict/.osc/merge | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/deletefile_fixtures/osctest/conflict/.osc/merge b/tests/deletefile_fixtures/osctest/conflict/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/deletefile_fixtures/osctest/conflict/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... |