##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix test broken in merge from stable
Sune Foldager -
r14330:473d0aaf default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -229,8 +229,8 binary file
229 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
229 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
230 $ cat orig >> binary-local
230 $ cat orig >> binary-local
231 $ python simplemerge -p binary-local base other
231 $ python simplemerge -p binary-local base other
232 abort: binary-local looks like a binary file.
232 warning: binary-local looks like a binary file.
233 [255]
233 [1]
234
234
235 binary file --text
235 binary file --text
236
236
General Comments 0
You need to be logged in to leave comments. Login now