##// END OF EJS Templates
patch: fix a str + bytes issue in an exception handler...
Matt Harbison -
r44127:eab0b738 stable
parent child Browse files
Show More
@@ -2290,7 +2290,7 b' def _applydiff('
2290 2290 try:
2291 2291 current_file = patcher(ui, gp, backend, store, eolmode=eolmode)
2292 2292 except PatchError as inst:
2293 ui.warn(str(inst) + b'\n')
2293 ui.warn(stringutil.forcebytestr(inst) + b'\n')
2294 2294 current_file = None
2295 2295 rejects += 1
2296 2296 continue
General Comments 0
You need to be logged in to leave comments. Login now