git://git.onelab.eu
/
playground.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
43879c3
)
and on
master
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 28 Mar 2015 15:57:05 +0000
(16:57 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 28 Mar 2015 15:57:05 +0000
(16:57 +0100)
cleanup.txt
patch
|
blob
|
history
diff --git
a/cleanup.txt
b/cleanup.txt
index
c00363d
..
fe47e71
100644
(file)
--- a/
cleanup.txt
+++ b/
cleanup.txt
@@
-517,3
+517,5
@@
and here we add stuff instead
and more
after the merge we go on
+
+and on