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
Merge remote-tracking branch 'local_master/generic'
[playground.git]
/
green.txt
diff --git
a/green.txt
b/green.txt
index
34f5450
..
3b9f07a
100644
(file)
--- a/
green.txt
+++ b/
green.txt
@@
-1
+1,2
@@
added in 1.4-0 - i.e. will be in 1.4-1
+checking mail on new devel box