git://git.onelab.eu / playground.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea75cbe f641be5)
resolving conflicts
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 27 May 2010 08:15:21 +0000 (10:15 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 27 May 2010 08:15:21 +0000 (10:15 +0200)
1  2 
orange.txt patch | diff1 | diff2 | blob | history

diff --cc orange.txt
index cc633fc,3bd1f0e..2e3793d
--- 1/orange.txt
--- 2/orange.txt
+++ b/orange.txt
@@@ -1,3 -1,2 +1,3 @@@
--foo
 +trying out the email-with-diffs feature
 +trying out the email-with-diffs (2)
+ bar
playground