checkout: implement "-" abbreviation, add docs and tests

diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh
index ea22837aa789e11e4c6b7c55d34747c94d5ab7ae..75d9602de4d4238b4182956127540525f711d33f 100755 (executable)
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6033-merge-crlf.sh
@@ -42,7 +42,7 @@ test_expect_success 'Check "ours" is CRLF' '
        test_cmp file file.temp
 '
 
-test_expect_failure 'Check that conflict file is CRLF' '
+test_expect_success 'Check that conflict file is CRLF' '
        git reset --hard a &&
        test_must_fail git merge side &&
        cat file | remove_cr | append_cr >file.temp &&