diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2013-10-26 21:17:16 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-10-28 09:00:38 -0700 |
| commit | f94ea11cf2b070ef221f0f4c2355a9ee2f340177 (patch) | |
| tree | cc219ab153738f62edb9f91c6d3d1bb4a2039cff /git-merge-resolve.sh | |
| parent | Windows: a test_cmp that is agnostic to random LF <> CRLF conversions (diff) | |
| download | tgif-f94ea11cf2b070ef221f0f4c2355a9ee2f340177.tar.xz | |
tests: undo special treatment of CRLF for Windows
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions