Merge branch 'master' of ssh://git.onelab.eu/git/playground
Thierry Parmentelat [Wed, 23 Jun 2010 10:29:00 +0000 (12:29 +0200)]
1  2 
orange.txt

diff --cc orange.txt
@@@ -1,5 -1,1 +1,2 @@@
- trying out the email-with-diffs feature
- trying out the email-with-diffs (2)
- bar
  foo
 +moving to git@onelab.eu