1 // TortoiseGitMerge - a Diff/Patch program
3 // Copyright (C) 2007-2008, 2010 - TortoiseSVN
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.
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.
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.
22 * \ingroup TortoiseMerge
23 * the different diff states a line can have.
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_MOVED_TO
, ///< line was moved here
36 DIFFSTATE_MOVED_FROM
, ///< line was moved from here
37 DIFFSTATE_EMPTY
, ///< empty line
38 DIFFSTATE_CONFLICTED
, ///< conflicted line
39 DIFFSTATE_CONFLICTED_IGNORED
, ///< a conflict which isn't conflicted due to ignore settings
40 DIFFSTATE_CONFLICTADDED
, ///< added line results in conflict
41 DIFFSTATE_CONFLICTEMPTY
, ///< removed line results in conflict
42 DIFFSTATE_CONFLICTRESOLVED
, ///< previously conflicted line, now resolved
43 DIFFSTATE_CONFLICTRESOLVEDEMPTY
, ///< previously conflicted line, now resolved but empty line
44 DIFFSTATE_IDENTICALREMOVED
, ///< identical removed lines in theirs and yours
45 DIFFSTATE_IDENTICALADDED
, ///< identical added lines in theirs and yours
46 DIFFSTATE_THEIRSREMOVED
, ///< removed line in theirs
47 DIFFSTATE_THEIRSADDED
, ///< added line in theirs
48 DIFFSTATE_YOURSREMOVED
, ///< removed line in yours
49 DIFFSTATE_YOURSADDED
, ///< added line in yours
50 DIFFSTATE_EDITED
, ///< manually edited line
51 DIFFSTATE_END
///< end marker for enum