# HG changeset patch
# User Chris Cannam
# Date 1294158843 0
# Node ID fccfd12faac1ca6a36254f82f3f7521ae59de722
# Parent  583faa8dadb6ed5e904e00e537c23c4751e4cc90# Parent  49bf8cc4f6b26f8c1af9e794b06c6ebb3f484299
Merge

diff -r 583faa8dadb6 -r fccfd12faac1 filestates.cpp
--- a/filestates.cpp	Tue Jan 04 16:33:56 2011 +0000
+++ b/filestates.cpp	Tue Jan 04 16:34:03 2011 +0000
@@ -71,6 +71,8 @@
     case Missing: return &m_missing;
     case InConflict: return &m_inConflict;
     case Ignored: return &m_ignored;
+
+    default: return &m_clean;
     }
 }