resolving conflicts
Thierry Parmentelat [Thu, 27 May 2010 08:15:21 +0000 (10:15 +0200)]
1  2 
orange.txt

diff --cc orange.txt
@@@ -1,3 -1,2 +1,3 @@@
--foo
 +trying out the email-with-diffs feature
 +trying out the email-with-diffs (2)
+ bar