You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10 lines
151 B
10 lines
151 B
15 years ago
|
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
|