From 5011ba940f23c1c78c49611fedfa9a5d189cff61 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 28 Oct 2012 22:03:44 +0200
Subject: Git: Support merge status

Change-Id: If0338d066a2844a8bedf3e5ecf89979dc5c20385
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/commitdata.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/plugins/git/commitdata.h')

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)
-- 
cgit v1.2.1