feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Support merge status

Browse Source 
Change-Id: If0338d066a2844a8bedf3e5ecf89979dc5c20385
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-10-28 22:03:44 +02:00
committed by Orgad Shaneh
parent ab85e7342e
commit 5011ba940f
3 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/commitdata.h
View File

@@ -75,6 +75,9 @@ enum FileState {
CopiedFile = 0x20,
UnmergedFile = 0x40,
UnmergedUs = 0x100,
UnmergedThem = 0x200,
UnknownFileState = 0x800
};
Q_DECLARE_FLAGS(FileStates, FileState)