diff options
Diffstat (limited to 'cervisia/tests/resolvedlg-conflict-test-02.txt')
| -rw-r--r-- | cervisia/tests/resolvedlg-conflict-test-02.txt | 9 |
1 files changed, 9 insertions, 0 deletions
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 |