mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / t / t0022-crlf-rename.sh
blob430a1d1d385b756c921652b2fc3580a727c57917
1 #!/bin/sh
3 test_description='ignore CR in CRLF sequence while computing similiarity'
5 . ./test-lib.sh
7 test_expect_success setup '
9 cat ../t0022-crlf-rename.sh >sample &&
10 git add sample &&
12 test_tick &&
13 git commit -m Initial &&
15 sed -e "s/\$/ /" ../t0022-crlf-rename.sh >elpmas &&
16 git add elpmas &&
17 rm -f sample &&
19 test_tick &&
20 git commit -a -m Second
24 test_expect_success 'diff -M' '
26 git diff-tree -M -r --name-status HEAD^ HEAD |
27 sed -e "s/R[0-9]*/RNUM/" >actual &&
28 echo "RNUM sample elpmas" >expect &&
29 diff -u expect actual
33 test_done