Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 1 | -2/+2 |
| | |||||
* | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys | 2015-03-16 | 1 | -0/+82 |