Skip to content
Unverified Commit 82e918a7 authored by Wallace's avatar Wallace Committed by GitHub
Browse files

add merge operator config (#446) 



Signed-off-by: default avatarLittle-Wallace <bupt2013211450@gmail.com>
parent f6c5af65
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment