From: Peter Schaefer <schaeferpm@gmail.com>
Date: Sun, 17 Feb 2019 11:01:46 +0000 (+0100)
Subject: save Merged Info
X-Git-Tag: v1.2~7
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=625259d50c37b706091869a088e59350ed647cb6;p=tex_tools.git

save Merged Info
---

diff --git a/gitLog2tikz.py b/gitLog2tikz.py
index 99051f1..bbced76 100644
--- a/gitLog2tikz.py
+++ b/gitLog2tikz.py
@@ -175,7 +175,7 @@ class Repo:
             self._children = {}
             self._parents = {}
             self._message= None
-            self._node_color = None
+            #self._node_color = None
             self._author = None
             self._date = None
             self._hash = Hash(hashes[0])
@@ -195,12 +195,14 @@ class Repo:
             elif info[0] == 'Date':
                 tmp = ':'.join(info[1:]).strip().split(' ')
                 self._date = tmp[2] + ' ' + tmp[1] + ' ' + tmp[4]
+            elif info[0] == 'Merge':
+                self._merge = info[1].strip().split(' ')
             elif line[0:4] == '    ':
                 if(self._message):
                     self._message = self._message + "\n" + line[4:]
                 else:
                     self._message = line[4:]
-            elif line.replace(' ','') == '' or info[0] == 'Merge':
+            elif line.replace(' ','') == '':
                 NotImplemented
             else:
                 raise ValueError('Unkown format: ' + line)
diff --git a/text-output.pdf b/text-output.pdf
index d686f0f..b218bdd 100644
Binary files a/text-output.pdf and b/text-output.pdf differ