summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict/resolver.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-12-26 14:36:33 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-12-26 17:18:10 +0800
commitf4bd9c0b5e1eafe6de855d73bfb606909229f382 (patch)
treebe9350fc52ab518676787906edff1adca0fb166b /lib/gitlab/git/conflict/resolver.rb
parent8139895b4362817cf947431fab9c95ce223b87ae (diff)
downloadgitlab-ce-f4bd9c0b5e1eafe6de855d73bfb606909229f382.tar.gz
Skip sha_attribute if we're checking statically
Diffstat (limited to 'lib/gitlab/git/conflict/resolver.rb')
0 files changed, 0 insertions, 0 deletions