src/TortoiseMerge/DiffStates.h

   1 // TortoiseMerge - a Diff/Patch program
   2
   3 // Copyright (C) 2007-2008 - TortoiseSVN
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #pragma once
  20
  21 /**
  22  * \ingroup TortoiseMerge
  23  * the different diff states a line can have.
  24  */
  25 enum DiffStates
  26 {
  27         DIFFSTATE_UNKNOWN,                                      ///< e.g. an empty file
  28         DIFFSTATE_NORMAL,                                       ///< no diffs found
  29         DIFFSTATE_REMOVED,                                      ///< line was removed
  30         DIFFSTATE_REMOVEDWHITESPACE,            ///< line was removed (whitespace diff)
  31         DIFFSTATE_ADDED,                                        ///< line was added
  32         DIFFSTATE_ADDEDWHITESPACE,                      ///< line was added (whitespace diff)
  33         DIFFSTATE_WHITESPACE,                           ///< line differs in whitespaces only
  34         DIFFSTATE_WHITESPACE_DIFF,                      ///< the in-line diffs of whitespaces
  35         DIFFSTATE_EMPTY,                                        ///< empty line
  36         DIFFSTATE_CONFLICTED,                           ///< conflicted line
  37         DIFFSTATE_CONFLICTED_IGNORED,           ///< a conflict which isn't conflicted due to ignore settings
  38         DIFFSTATE_CONFLICTADDED,                        ///< added line results in conflict
  39         DIFFSTATE_CONFLICTEMPTY,                        ///< removed line results in conflict
  40         DIFFSTATE_CONFLICTRESOLVED,                     ///< previously conflicted line, now resolved
  41         DIFFSTATE_CONFLICTRESOLVEDEMPTY,        ///< previously conflicted line, now resolved but empty line
  42         DIFFSTATE_IDENTICALREMOVED,                     ///< identical removed lines in theirs and yours
  43         DIFFSTATE_IDENTICALADDED,                       ///< identical added lines in theirs and yours
  44         DIFFSTATE_THEIRSREMOVED,                        ///< removed line in theirs
  45         DIFFSTATE_THEIRSADDED,                          ///< added line in theirs
  46         DIFFSTATE_YOURSREMOVED,                         ///< removed line in yours
  47         DIFFSTATE_YOURSADDED,                           ///< added line in yours
  48         DIFFSTATE_EDITED,                                       ///< manually edited line
  49         DIFFSTATE_END                                           ///< end marker for enum
  50 };