diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2011-12-12 22:13:46 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-12-13 10:21:01 +0100 |
| commit | 82c7aac17d59b10bc6e4bf0c3ed9e0b6376a052a (patch) | |
| tree | 73545edd4b7516ea7d98cd08c6a2e17d6794fac5 /src/plugins/git/commitdata.h | |
| parent | 1899a3838f012a43abaeba3959c1b591649fde1e (diff) | |
| download | qt-creator-82c7aac17d59b10bc6e4bf0c3ed9e0b6376a052a.tar.gz | |
Git: Flag conflict
Change-Id: I3518367afeeb27b4408f396daf3362ae76148846
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/git/commitdata.h')
| -rw-r--r-- | src/plugins/git/commitdata.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index 1f43c985bc..d6221b1d2e 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -72,13 +72,13 @@ public: enum FileState { UntrackedFile = 0, - StagedFile = 1, - ModifiedFile = 2, - AddedFile = 3, - DeletedFile = 4, - RenamedFile = 8, - CopiedFile = 16, - UpdatedFile = 32, + StagedFile = 0x01, + ModifiedFile = 0x02, + AddedFile = 0x04, + DeletedFile = 0x08, + RenamedFile = 0x10, + CopiedFile = 0x20, + UpdatedFile = 0x40, ModifiedStagedFile = StagedFile | ModifiedFile, AddedStagedFile = StagedFile | AddedFile, |