diff --git a/.file2.txt.swp b/.file2.txt.swp
new file mode 100644
index 0000000000..9475c57c47
Binary files /dev/null and b/.file2.txt.swp differ
diff --git a/.file2_LOCAL_2638.txt.swp b/.file2_LOCAL_2638.txt.swp
new file mode 100644
index 0000000000..43a9a828d7
Binary files /dev/null and b/.file2_LOCAL_2638.txt.swp differ
diff --git a/.file2_REMOTE_2638.txt.swp b/.file2_REMOTE_2638.txt.swp
new file mode 100644
index 0000000000..b5159fb6ec
Binary files /dev/null and b/.file2_REMOTE_2638.txt.swp differ
diff --git a/file1.txt b/file1.txt
new file mode 100644
index 0000000000..ca11923d02
--- /dev/null
+++ b/file1.txt
@@ -0,0 +1 @@
+Изменение А
diff --git a/file2.txt b/file2.txt
new file mode 100644
index 0000000000..683f6f047e
--- /dev/null
+++ b/file2.txt
@@ -0,0 +1 @@
+Изменение B
diff --git a/file2_BACKUP_2638.txt b/file2_BACKUP_2638.txt
new file mode 100644
index 0000000000..05c7987f49
--- /dev/null
+++ b/file2_BACKUP_2638.txt
@@ -0,0 +1 @@
+Изменение 2
diff --git a/file2_BASE_2638.txt b/file2_BASE_2638.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/file2_LOCAL_2638.txt b/file2_LOCAL_2638.txt
new file mode 100644
index 0000000000..683f6f047e
--- /dev/null
+++ b/file2_LOCAL_2638.txt
@@ -0,0 +1 @@
+Изменение B
diff --git a/file2_REMOTE_2638.txt b/file2_REMOTE_2638.txt
new file mode 100644
index 0000000000..05c7987f49
--- /dev/null
+++ b/file2_REMOTE_2638.txt
@@ -0,0 +1 @@
+Изменение 2
diff --git a/file3.txt b/file3.txt
new file mode 100644
index 0000000000..33b502f357
--- /dev/null
+++ b/file3.txt
@@ -0,0 +1 @@
+Изменение С
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test1.txt b/test1.txt
new file mode 100644
index 0000000000..28c55466f9
--- /dev/null
+++ b/test1.txt
@@ -0,0 +1,2 @@
+jgfjfgkjubhgrkjotre
+
diff --git a/test2.txt b/test2.txt
new file mode 100644
index 0000000000..e459bc8716
--- /dev/null
+++ b/test2.txt
@@ -0,0 +1 @@
+345123