##// END OF EJS Templates
simplemerge: convert `merge_lines()` away from generator...
simplemerge: convert `merge_lines()` away from generator We always consume all the lines and put them in a list anyway. By making the function not a generator, we can later make it return an additional value (to indicate if there were conflicts). Differential Revision: https://phab.mercurial-scm.org/D11973

File last commit:

r44311:8766728d default
r49388:3f5bc446 default
Show More
pyutil.h
15 lines | 228 B | text/x-c | CLexer
#include <Python.h>
#if PY_MAJOR_VERSION >= 3
#define PYCODETYPE PyObject
#else
#define PYCODETYPE PyCodeObject
#endif
namespace contrib
{
void initpy(const char *cselfpath);
PyObject *pyglobals();
} /* namespace contrib */