upstream/mercurial-mirror Files · mercurial/thirdparty/xdiff/xinclude.h

merge: check for conflicting actions irrespective of length of bids...

merge: check for conflicting actions irrespective of length of bids We should for whether bids contain a combination of actions which conflict with each other. Since right now we only have couple of such combination, and combinations also consist of two actions, we were checking for them only when length of bids is 2. Let's check that irrespective of the length of bids.

Jun Wu - - Load All Authors

File last commit:

r36781:90f8fe72 default


                r46207:588068d5

default

Download file

             xinclude.h
        
                    40 lines
            
             | 1.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / thirdparty / xdiff / xinclude.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       *  LibXDiff by Davide Libenzi ( File Differential Library )

       *  Copyright (C) 2003  Davide Libenzi

       *

       *  This library is free software; you can redistribute it and/or

       *  modify it under the terms of the GNU Lesser General Public

       *  License as published by the Free Software Foundation; either

       *  version 2.1 of the License, or (at your option) any later version.

       *

       *  This library is distributed in the hope that it will be useful,

       *  but WITHOUT ANY WARRANTY; without even the implied warranty of

       *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

       *  Lesser General Public License for more details.

       *

       *  You should have received a copy of the GNU Lesser General Public

       *  License along with this library; if not, see

       *  <http://www.gnu.org/licenses/>.

       *

       *  Davide Libenzi <davidel@xmailserver.org>

       *

       */

      #if !defined(XINCLUDE_H)

      #define XINCLUDE_H

      #include <ctype.h>

      #include <stdio.h>

      #include <stdlib.h>

      #include <string.h>

      #include <limits.h>

      #include "xmacros.h"

      #include "xdiff.h"

      #include "xtypes.h"

      #include "xutils.h"

      #include "xprepare.h"

      #include "xdiffi.h"

      #endif /* #if !defined(XINCLUDE_H) */

	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

				/*
				* LibXDiff by Davide Libenzi ( File Differential Library )
				* Copyright (C) 2003 Davide Libenzi
				*
				* This library is free software; you can redistribute it and/or
				* modify it under the terms of the GNU Lesser General Public
				* License as published by the Free Software Foundation; either
				* version 2.1 of the License, or (at your option) any later version.
				*
				* This library is distributed in the hope that it will be useful,
				* but WITHOUT ANY WARRANTY; without even the implied warranty of
				* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
				* Lesser General Public License for more details.
				*
				* You should have received a copy of the GNU Lesser General Public
				* License along with this library; if not, see
				* <http://www.gnu.org/licenses/>.
				*
				* Davide Libenzi <davidel@xmailserver.org>
				*
				*/

				#if !defined(XINCLUDE_H)
				#define XINCLUDE_H

				#include <ctype.h>
				#include <stdio.h>
				#include <stdlib.h>
				#include <string.h>
				#include <limits.h>

				#include "xmacros.h"
				#include "xdiff.h"
				#include "xtypes.h"
				#include "xutils.h"
				#include "xprepare.h"
				#include "xdiffi.h"


				#endif /* #if !defined(XINCLUDE_H) */