projects
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
change over file2
[test.git]
/
file2.txt
diff --git
a/file2.txt
b/file2.txt
index
c317270
..
9c36491
100644
(file)
--- a/
file2.txt
+++ b/
file2.txt
@@
-1,2
+1,7
@@
-Second file
+<<<<<<< e73427bfbfa58797dc64a37c36a6cc025482eb38
+Second file :-)
+>>>>>>> my changes on master
With a new line
+other line
+
+other line