diff --git c/meld/vc/git.py i/meld/vc/git.py
index 5949951..5db2063 100644
--- c/meld/vc/git.py
+++ i/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 = {