Commit 07e3b2ab5a86710939f0d9f1f12d861842360c2e

fixed conflict

Commit diff

config/initializers/requires.rb

 
11require "core_ext"
22require "fileutils"
33require "git"
4require "diff-display/lib/diff/display/unified"
4require "diff-display/lib/diff/display/unified"
toggle raw diff