projects
/
test.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
change over file2
[test.git]
/
file2.txt
1
<<<<<<< e73427bfbfa58797dc64a37c36a6cc025482eb38
2
Second file :-)
3
>>>>>>> my changes on master
4
With a new line
5
other line
6
7
other line