OSDN Git Service

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