pgf2i68xt
/
gittest
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 '24a5aefdc2'
${ noResults }
gittest/1.txt

8 lines
70 B
Raw Normal View History Unescape

111
11 months ago
42120412
branch1
11 months ago
branch1
Merge branch 'branch2' # Conflicts: # 1.txt
11 months ago
<<<<<<< HEAD
branch2
11 months ago
branch2
Merge branch 'branch2' # Conflicts: # 1.txt
11 months ago
=======
branch2
>>>>>>> branch2