[meld] Add missing status codes to git diff-index parsing

[Kai Willadsen <kaiw src gnome org>]

commit b82e67358d02598f079f79a0fccf8415fa8a889b
Author: Tom Scytale <scytale gmail com>
Date:   Sat Nov 2 06:27:08 2013 +1000

    Add missing status codes to git diff-index parsing

 meld/vc/git.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 5949951..5db2063 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -45,7 +45,7 @@ class Vc(_vc.CachedVc):
 
     VC_COLUMNS = (_vc.DATA_NAME, _vc.DATA_STATE, _vc.DATA_OPTIONS)
 
-    GIT_DIFF_FILES_RE = ":(\d+) (\d+) [a-z0-9]+ [a-z0-9]+ ([ADMU])\t(.*)"
+    GIT_DIFF_FILES_RE = ":(\d+) (\d+) [a-z0-9]+ [a-z0-9]+ ([XADMTU])\t(.*)"
     DIFF_RE = re.compile(GIT_DIFF_FILES_RE)
 
     conflict_map = {