diff options
Diffstat (limited to 'lib/gitlab/git/conflict/file.rb')
| -rw-r--r-- | lib/gitlab/git/conflict/file.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/git/conflict/file.rb b/lib/gitlab/git/conflict/file.rb index b2bc653904d..fc1595f1faf 100644 --- a/lib/gitlab/git/conflict/file.rb +++ b/lib/gitlab/git/conflict/file.rb @@ -19,8 +19,8 @@ module Gitlab begin @type = 'text' @lines = Gitlab::Git::Conflict::Parser.parse(content, - our_path: our_path, - their_path: their_path) + our_path: our_path, + their_path: their_path) rescue Gitlab::Git::Conflict::Parser::ParserError @type = 'text-editor' @lines = nil @@ -46,7 +46,7 @@ module Gitlab end def line_code(line) - Gitlab::Git::Conflict::LineCode.generate(our_path, line[:line_new], line[:line_old]) + Gitlab::Git.diff_line_code(our_path, line[:line_new], line[:line_old]) end def resolve_lines(resolution) |