From 8c80de0054e0627e281c0897d7e724b4f27fa6aa Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@gmail.com>
Date: Thu, 1 Oct 2015 14:16:43 -0400
Subject: [PATCH] in branch_1

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

diff --git a/textfile b/textfile
index 670d74f..b8c810a 100644
--- a/textfile
+++ b/textfile
@@ -1,3 +1,5 @@
 this is a text file.
 
 THIS IS NOT AN  ERROR AND MUST BE IN HISTORY.
+
+In branch 1