##// END OF EJS Templates
partial-merge: add support for `.args` config (`$local` etc.)...
partial-merge: add support for `.args` config (`$local` etc.) It will be useful to be able to define custom command-line arguments per partial merge tool just like we have for regular merge tools. In particular, I expect the same binary to handle multiple languages, so it will be useful to be able to pass some argument indicating the language, or perhaps simply an argument defining a regex that's used for finding lines to merge as a sorted set. Differential Revision: https://phab.mercurial-scm.org/D12383

File last commit:

r44311:8766728d default
r49839:9dfbea54 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 */