diff options
Diffstat (limited to 'cervisia/tests')
| -rw-r--r-- | cervisia/tests/resolvedlg-BR74903-test-01.txt | 4 | ||||
| -rw-r--r-- | cervisia/tests/resolvedlg-conflict-test-01.txt | 5 | ||||
| -rw-r--r-- | cervisia/tests/resolvedlg-conflict-test-02.txt | 9 |
3 files changed, 18 insertions, 0 deletions
diff --git a/cervisia/tests/resolvedlg-BR74903-test-01.txt b/cervisia/tests/resolvedlg-BR74903-test-01.txt new file mode 100644 index 00000000..c4b8a22f --- /dev/null +++ b/cervisia/tests/resolvedlg-BR74903-test-01.txt @@ -0,0 +1,4 @@ +123 +<<<<<<< resolvedlg-BR74903-test-01.txt +conf======= +456>>>>>>> 1.2 diff --git a/cervisia/tests/resolvedlg-conflict-test-01.txt b/cervisia/tests/resolvedlg-conflict-test-01.txt new file mode 100644 index 00000000..bbcd08c3 --- /dev/null +++ b/cervisia/tests/resolvedlg-conflict-test-01.txt @@ -0,0 +1,5 @@ +<<<<<<< resolvedlg-conflict-test-01.txt +Line 1 - modified on CONFLICT_BRANCH +======= +Line 1 - modified on HEAD +>>>>>>> 1.2 diff --git a/cervisia/tests/resolvedlg-conflict-test-02.txt b/cervisia/tests/resolvedlg-conflict-test-02.txt new file mode 100644 index 00000000..5d72025e --- /dev/null +++ b/cervisia/tests/resolvedlg-conflict-test-02.txt @@ -0,0 +1,9 @@ +Line 1 +Line 2 +<<<<<<< resolvedlg-conflict-test-02.txt +Line 3 - modified on CONFLICT_BRANCH +======= +Line 3 - modified on HEAD +>>>>>>> 1.2 +Line 4 +Line 5 |