equal
deleted
inserted
replaced
45 python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
45 python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
46 cat orig >> binary-local |
46 cat orig >> binary-local |
47 python simplemerge -p binary-local base other |
47 python simplemerge -p binary-local base other |
48 |
48 |
49 echo '% binary file --text' |
49 echo '% binary file --text' |
50 python simplemerge -a -p binary-local base other |
50 python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/repr.py |
51 |
51 |
52 echo '% help' |
52 echo '% help' |
53 python simplemerge --help |
53 python simplemerge --help |
54 |
54 |
55 echo '% wrong number of arguments' |
55 echo '% wrong number of arguments' |