diff --git a/test/test_merge_1.txt b/test/test_merge_1.txt new file mode 100644 index 000000000..d1fffa483 --- /dev/null +++ b/test/test_merge_1.txt @@ -0,0 +1,6 @@ +to test process: +1. go to main +2. fetch origin +3. pull origin +4. go to branch +5. merge into current branch diff --git a/test/test_merge_2.txt b/test/test_merge_2.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/test_merge_2.txt @@ -0,0 +1 @@ + diff --git a/test/test_merge_3.txt b/test/test_merge_3.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/test_merge_3.txt @@ -0,0 +1 @@ + diff --git a/test/test_merge_4.txt b/test/test_merge_4.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/test_merge_4.txt @@ -0,0 +1 @@ +