From 5feaa48636b8a8a804af85c80d8b7a61cddda48c Mon Sep 17 00:00:00 2001
From: Allan Odgaard <git@abetarda.com>
Date: Sat, 18 Aug 2012 14:00:33 +0200
Subject: [PATCH] fixup! git: show modifications in upstream folders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A new ‘mixed’ state was introduced with no ‘to_s()’ support (used for debug output and the ‘scmls’ test executable).
---
 Frameworks/scm/src/drivers/api.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Frameworks/scm/src/drivers/api.cc b/Frameworks/scm/src/drivers/api.cc
index 2b7f7652..7dee4459 100644
--- a/Frameworks/scm/src/drivers/api.cc
+++ b/Frameworks/scm/src/drivers/api.cc
@@ -53,6 +53,7 @@ namespace scm
 				case modified:     return "M";
 				case ignored:      return "I";
 				case deleted:      return "D";
+				case mixed:        return "X";
 				case unversioned:  return "U";
 				default:           return text::format("unknown (%d)", status);
 			}