3
test_description='ask merge-recursive to merge binary files'
7
test_expect_success setup '
9
cat ../test4012.png >m &&
11
git ls-files -s | sed -e "s/ 0 / 1 /" >E1 &&
13
git commit -m "initial" &&
20
git ls-files -s a >E0 &&
21
git ls-files -s m | sed -e "s/ 0 / 3 /" >E3 &&
23
git commit -m "master adds some" &&
28
git ls-files -s m | sed -e "s/ 0 / 2 /" >E2 &&
30
git commit -m "side modifies" &&
34
cat E0 E1 E2 E3 >expect
37
test_expect_success resolve '
40
git reset --hard anchor &&
42
if git merge -s resolve master
44
echo Oops, should not have succeeded
47
git ls-files -s >current
48
diff -u current expect
52
test_expect_success recursive '
55
git reset --hard anchor &&
57
if git merge -s recursive master
59
echo Oops, should not have succeeded
62
git ls-files -s >current
63
diff -u current expect