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