global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-07 08:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! MinGW: Update tests to handle a native eol of crlf

Browse Source
This commit is contained in:
Johannes Schindelin
2014-04-16 17:55:39 -05:00
parent 5cb0a6d931
commit 6845d53e87
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6038-merge-text-auto.sh
View File

@@ -131,7 +131,7 @@ test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
if test_have_prereq NATIVE_CRLF; then
echo ======= | append_cr >>expected &&
echo first line | append_cr >>expected &&
echo same line | append_cr >>expected
echo same line | append_cr >>expected
else
echo ======= >>expected &&
echo first line >>expected &&