git://git.onelab.eu
/
playground.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
and on
[playground.git]
/
cleanup.txt
diff --git
a/cleanup.txt
b/cleanup.txt
index
abe69aa
..
fe47e71
100644
(file)
--- a/
cleanup.txt
+++ b/
cleanup.txt
@@
-516,3
+516,6
@@
and here we add stuff instead
and more
+after the merge we go on
+
+and on