Commit 82c7aac1 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger
Browse files

Git: Flag conflict



Change-Id: I3518367afeeb27b4408f396daf3362ae76148846
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 1899a383
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment