Add test to ensure that "stg clean" preserves conflicting patches