p3jftc9gz
/
git-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '1396bc2aa5'
${ noResults }
git-test/1.txt

8 lines
52 B
Raw Normal View History Unescape

Merge branch 'branch1' # Conflicts: # 1.txt
2 months ago
<<<<<<< .mine
=======
branch1
2 months ago
111
111 branch1
2 months ago
branch1
Merge branch 'branch1' # Conflicts: # 1.txt
2 months ago
>>>>>>> .theirs