Configure default merge tool settings to improve merge conflict resolution.
Configure default merge tool settings to improve merge conflict resolution.