diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-10-28 22:03:44 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-10-29 14:59:42 +0100 |
| commit | 5011ba940f23c1c78c49611fedfa9a5d189cff61 (patch) | |
| tree | ac9dfd3180a6216f5cb0f4118cbeebe5850da9f9 /src/plugins/git/commitdata.h | |
| parent | ab85e7342e7b51a10b6bf5ebc66c1a47c70f3fa6 (diff) | |
| download | qt-creator-5011ba940f23c1c78c49611fedfa9a5d189cff61.tar.gz | |
Git: Support merge status
Change-Id: If0338d066a2844a8bedf3e5ecf89979dc5c20385
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/commitdata.h')
| -rw-r--r-- | src/plugins/git/commitdata.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index 27293746a1..2e55a53392 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -75,6 +75,9 @@ enum FileState { CopiedFile = 0x20, UnmergedFile = 0x40, + UnmergedUs = 0x100, + UnmergedThem = 0x200, + UnknownFileState = 0x800 }; Q_DECLARE_FLAGS(FileStates, FileState) |