summaryrefslogtreecommitdiffstats
path: root/test/integration/pullMerge/expected/repo/myfile2
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/pullMerge/expected/repo/myfile2')
-rw-r--r--test/integration/pullMerge/expected/repo/myfile21
1 files changed, 0 insertions, 1 deletions
diff --git a/test/integration/pullMerge/expected/repo/myfile2 b/test/integration/pullMerge/expected/repo/myfile2
deleted file mode 100644
index 180cf8328..000000000
--- a/test/integration/pullMerge/expected/repo/myfile2
+++ /dev/null
@@ -1 +0,0 @@
-test2