diff options
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) |