Commit 0f24cac2b926e4842f6890ee1712ac2d85cc020c

Jacques Germishuys 2015-03-09T17:03:03

Added tests to merge files and branches with whitespace problems and fixes