diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-21 12:28:13 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-21 12:28:13 +0000 |
| commit | 2a8841ae8750b52645eb85dd56305798a429a26d (patch) | |
| tree | 2d03997a949ac7b9339803be3ca90e7c1b7c44e9 /tests/merge/merge_helpers.h | |
| parent | 7f52bc5a0f4614608ec0dc47edb1ae64f1b9e941 (diff) | |
| download | libgit2-ethomson/conflicts_crlf.tar.gz | |
merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlf
Ensure that when the files being merged have CR/LF line endings that the
conflict markers produced in the conflict file also have CR/LF line
endings.
Diffstat (limited to 'tests/merge/merge_helpers.h')
0 files changed, 0 insertions, 0 deletions