summaryrefslogtreecommitdiff
path: root/tests/resources/merge-whitespace
Commit message (Expand)AuthorAgeFilesLines
* Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-1647-0/+40