Commit 45a86bbfd028a545a71d3e1ea5518d467be8b5aa

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

Allow for merges with whitespace discrepancies