Merge branch 'master' of ssh://git.onelab.eu/git/playground
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Jun 2010 10:29:00 +0000 (12:29 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Jun 2010 10:29:00 +0000 (12:29 +0200)
orange.txt

index ebb6d70..99ff497 100644 (file)
@@ -1,5 +1,2 @@
-trying out the email-with-diffs feature
-trying out the email-with-diffs (2)
-bar
 foo
 moving to git@onelab.eu