Fix stg-whatchanged to deal with conflicts already solved.