Module: Merge

Defined in:

lib/merge/bases.rb,
lib/merge/diff3.rb,
lib/merge/inputs.rb,
lib/merge/resolve.rb,
lib/merge/common_ancestors.rb

Defined Under Namespace

Classes: Bases, CherryPick, CommonAncestors, Diff3, Inputs, Resolve