From c14accc9b3608c09701e7e7bd3779a9523e029aa Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@gmail.com>
Date: Thu, 16 Jul 2015 12:50:46 -0400
Subject: [PATCH] nsdsd

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

diff --git a/textfile b/textfile
index 670d74f..9838fcb 100644
--- a/textfile
+++ b/textfile
@@ -1,3 +1,5 @@
 this is a text file.
 
 THIS IS NOT AN  ERROR AND MUST BE IN HISTORY.
+
+this has been changed in branch_b