From cd029ca5548e6d557fc65ff62797a7cb0e3d0fd4 Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@gmail.com>
Date: Thu, 1 Oct 2015 14:17:37 -0400
Subject: [PATCH] in branch_2

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

diff --git a/foo b/foo
index 2833bef..8ce13da 100644
--- a/foo
+++ b/foo
@@ -1 +1,3 @@
 this is a better message in the "foo" file.
+
+In branch 2