Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions file1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ adding more code
vuhwvhf okmpg3ng ;ihtg

ghfjdt

Hi there !!!!
13 changes: 12 additions & 1 deletion file2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,16 @@
i am in branch1
trying merging branch

<<<<<<< HEAD







Hello !
=======
I am a change
Trying to make a change
Trying to make a change
>>>>>>> f3280a6109063f0ab55b73717001e4de507c4eea