From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 27 May 2010 08:15:21 +0000 (+0200)
Subject: resolving conflicts
X-Git-Tag: out-of-band~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=513d329899ac8ebc054725340e86c1aa10f4c163;hp=ea75cbe86181d59a78ad445c31efe537b89984a7;p=playground.git

resolving conflicts
---

diff --git a/orange.txt b/orange.txt
index cc633fc..2e3793d 100644
--- 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