--- git.py.orig	2010-04-28 20:48:54.290276999 +0400
+++ git.py	2010-04-28 20:49:34.139027243 +0400
@@ -39,12 +39,13 @@
     PATCH_STRIP_NUM = 1
     PATCH_INDEX_RE = "^diff --git a/(.*) b/.*$"
     state_map = {
-        "unknown":    _vc.STATE_NONE,
-        "new file":   _vc.STATE_NEW,
-        "deleted":    _vc.STATE_REMOVED,
-        "modified":   _vc.STATE_MODIFIED,
-        "typechange": _vc.STATE_MODIFIED,
-        "unmerged":   _vc.STATE_CONFLICT,
+        "unknown":       _vc.STATE_NONE,
+        "new file":      _vc.STATE_NEW,
+        "deleted":       _vc.STATE_REMOVED,
+        "modified":      _vc.STATE_MODIFIED,
+        "typechange":    _vc.STATE_MODIFIED,
+        "unmerged":      _vc.STATE_CONFLICT,
+        "both modified": _vc.STATE_CONFLICT,
     }
 
     def commit_command(self, message):
