Add a new test for git-merge-resolve

diff --git a/t/t0022-crlf-rename.sh b/t/t0022-crlf-rename.sh
index 430a1d1d385b756c921652b2fc3580a727c57917..7d1ce2d0563b3734d754c171d21580075264bbb2 100755 (executable)
--- a/t/t0022-crlf-rename.sh
+++ b/t/t0022-crlf-rename.sh
@@ -26,7 +26,7 @@ test_expect_success 'diff -M' '
        git diff-tree -M -r --name-status HEAD^ HEAD |
        sed -e "s/R[0-9]*/RNUM/" >actual &&
        echo "RNUM      sample  elpmas" >expect &&
-       diff -u expect actual
+       test_cmp expect actual
 
 '