From 88792ca0733958fe6570db08813ab047584eaf39 Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@gmail.com>
Date: Thu, 16 Jul 2015 13:01:20 -0400
Subject: [PATCH] in branch A

---
 foo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/foo b/foo
index 4ba99ad..97a9831 100644
--- a/foo
+++ b/foo
@@ -1,2 +1,4 @@
 this is a better message in the "foo" file.
+
+
 this line has been written in branch_a