Merge pull request #272 from jwakely/trailing-whitespace

Prevent amalgamate.py from adding trailing whitespace

Author: lemire

script/amalgamate.py

@@ -27,7 +27,10 @@
 
   text = ''
   for line in lines:
-    text += '//    ' + line.strip() + '\n'
+    line = line.strip()
+    if len(line):
+      line = '    ' + line
+    text += '//' + line + '\n'
   processed_files[filename] = text
 
 # code