git://git.onelab.eu / playground.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b7d044 73039db)
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)
1  2 
orange.txt patch | diff1 | diff2 | blob | history

diff --cc orange.txt
index ebb6d70,257cc56..99ff497
--- 1/orange.txt
--- 2/orange.txt
+++ b/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
playground