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

Git: Flag conflict

Browse Source 
Change-Id: I3518367afeeb27b4408f396daf3362ae76148846
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2011-12-12 22:13:46 +02:00
committed by Tobias Hunger
parent 1899a3838f
commit 82c7aac17d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,13 +72,13 @@ public:
enum FileState { enum FileState {
UntrackedFile = 0, UntrackedFile = 0,
StagedFile = 1, StagedFile = 0x01,
ModifiedFile = 2, ModifiedFile = 0x02,
AddedFile = 3, AddedFile = 0x04,
DeletedFile = 4, DeletedFile = 0x08,
RenamedFile = 8, RenamedFile = 0x10,
CopiedFile = 16, CopiedFile = 0x20,
UpdatedFile = 32, UpdatedFile = 0x40,
ModifiedStagedFile = StagedFile | ModifiedFile, ModifiedStagedFile = StagedFile | ModifiedFile,
AddedStagedFile = StagedFile | AddedFile, AddedStagedFile = StagedFile | AddedFile,