Module: Gitlab::Git::Conflict

Defined in:

lib/gitlab/git/conflict/file.rb,
lib/gitlab/git/conflict/parser.rb,
lib/gitlab/git/conflict/resolver.rb,
lib/gitlab/git/conflict/resolution.rb

Defined Under Namespace

Classes: File, Parser, Resolution, Resolver