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

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

simplemerge: write output only once it's complete...
simplemerge: write output only once it's complete `simplemerge()` can write either to `ui.fout` or to the file context (for in-memory merge). This patch simplifies the code a bit by making it build the output the same way regardless of where it's written, and then writes the whole output at once. I don't think it will be a problem that we don't output anything until the whole file is merged even if the file is large. Differential Revision: https://phab.mercurial-scm.org/D9550
Martin von Zweigbergk -
r46716:a771ffc3 default
Show More
Name Size Modified Last Commit Author
/ mercurial / thirdparty / xdiff
xdiff.h Loading ...
xdiffi.c Loading ...
xdiffi.h Loading ...
xinclude.h Loading ...
xmacros.h Loading ...
xprepare.c Loading ...
xprepare.h Loading ...
xtypes.h Loading ...
xutils.c Loading ...
xutils.h Loading ...