resolvedlg-conflict-test-01.txt\tests\cervisia - tdesdk - TDE software development kit

summary refs log tree commit diff stats

path: root/cervisia/tests/resolvedlg-conflict-test-01.txt

blob: bbcd08c3717bb6f591c6fc4a5ee03b5ecddc46eb (plain)

<<<<<<< resolvedlg-conflict-test-01.txt
Line 1 - modified on CONFLICT_BRANCH
=======
Line 1 - modified on HEAD
>>>>>>> 1.2