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.
6 lines
123 B
6 lines
123 B
15 years ago
|
<<<<<<< resolvedlg-conflict-test-01.txt
|
||
|
|
Line 1 - modified on CONFLICT_BRANCH
|
||
|
|
=======
|
||
|
|
Line 1 - modified on HEAD
|
||
|
|
>>>>>>> 1.2
|