# HG changeset patch # User Chris Cannam # Date 1294158267 0 # Node ID 49bf8cc4f6b26f8c1af9e794b06c6ebb3f484299 # Parent 3cc6455e58c2e8c70252b41a75249c008e4bd36c# Parent d256cc418fa3df962bc2dca74cffda493e38f94e Merge diff -r d256cc418fa3 -r 49bf8cc4f6b2 filestates.cpp --- a/filestates.cpp Tue Jan 04 15:22:07 2011 +0000 +++ b/filestates.cpp Tue Jan 04 16:24:27 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; } }