3 . "$(dirname "$0")/testlib.sh"
5 begin_test "mergetool works with large files"
9 reponame="mergetool-works-with-large-files"
14 printf "base" > conflict.dat
15 git add .gitattributes conflict.dat
16 git commit -m "initial commit"
18 git checkout -b conflict
19 printf "b" > conflict.dat
21 git commit -m "conflict.dat: b"
25 printf "a" > conflict.dat
27 git commit -m "conflict.dat: a"
33 git config mergetool.inspect.cmd '
34 for i in BASE LOCAL REMOTE; do
35 echo "\$$i=$(eval "cat \"\$$i\"")";
39 git config mergetool.inspect.trustExitCode true
44 -- conflict.dat 2>&1 \
47 grep "\$BASE=base" mergetool.log
48 grep "\$LOCAL=a" mergetool.log
49 grep "\$REMOTE=b" mergetool.log