upstream/mercurial-mirror Files · contrib/fuzz/pyutil.h

diff: add experimental support for "merge diffs"...

diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

Augie Fackler - - Load All Authors

File last commit:

r44311:8766728d default


                r47177:1a7d12c8

default

Download file

             pyutil.h
        
                    15 lines
            
             | 228 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / fuzz / pyutil.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #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 */

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#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 */