git://git.onelab.eu / playground.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: ea75cbe)
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)
orange.txt patch | blob | history

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