Show More
@@ -49,7 +49,8 b' echo % lookup' | |||
|
49 | 49 | echo % branches |
|
50 | 50 | "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=branches' |
|
51 | 51 | echo % changegroup |
|
52 | "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' | |
|
52 | "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' \ | |
|
53 | | $TESTDIR/repr.py | |
|
53 | 54 | echo % stream_out |
|
54 | 55 | "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=stream_out' |
|
55 | 56 | echo % failing unbundle, requires POST request |
|
1 | NO CONTENT: modified file, binary diff hidden |
@@ -47,7 +47,7 b' cat orig >> binary-local' | |||
|
47 | 47 | python simplemerge -p binary-local base other |
|
48 | 48 | |
|
49 | 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 | 52 | echo '% help' |
|
53 | 53 | python simplemerge --help |
|
1 | NO CONTENT: modified file, binary diff hidden |
General Comments 0
You need to be logged in to leave comments.
Login now