module Redcar module Scm class MergeConflictError < RuntimeError; end end end