Sha256: 6306cc7f34bbfc35e784ed310698783c7a484fc91c147f2f013f74833349cbb7
Contents?: true
Size: 416 Bytes
Versions: 1
Compression:
Stored size: 416 Bytes
Contents
class Vcs def mk_conflicts_list status.grep(/^C/).each { |s| s.sub!(/^C\s+(.*)\n/, '\1') } end def edit_conflicts system("#{EDITOR} #{mk_conflicts_list}") end def resolve_conflicts conflicts = mk_conflicts_list question = "Resolve these conflicts: \n - #{conflicts.join("\n - ")}\n" if ask(question, :n) == :y return resolved(conflicts) end [] end end # class Vcs
Version data entries
1 entries across 1 versions & 1 rubygems
Version | Path |
---|---|
vcs-0.2.148 | src/conflict.rb |