Show More
@@ -515,7 +515,7 b' def _xmerge(repo, mynode, orig, fcd, fco' | |||
|
515 | 515 | (tool, fcd.path())) |
|
516 | 516 | repo.ui.debug('launching merge tool: %s\n' % cmd) |
|
517 | 517 | r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') |
|
518 |
repo.ui.debug('merge tool returned: % |
|
|
518 | repo.ui.debug('merge tool returned: %d\n' % r) | |
|
519 | 519 | return True, r, False |
|
520 | 520 | finally: |
|
521 | 521 | util.unlink(b) |
@@ -457,7 +457,7 b' def b85diff(to, tn):' | |||
|
457 | 457 | # TODO: deltas |
|
458 | 458 | ret = [] |
|
459 | 459 | ret.append('GIT binary patch\n') |
|
460 |
ret.append('literal % |
|
|
460 | ret.append('literal %d\n' % len(tn)) | |
|
461 | 461 | for l in chunk(zlib.compress(tn)): |
|
462 | 462 | ret.append(fmtline(l)) |
|
463 | 463 | ret.append('\n') |
General Comments 0
You need to be logged in to leave comments.
Login now