I'd used fugitive for awhile but found the diff too cluttered. I switched to diffconflicts. It is not the only information needed to handle a merge, but it is often context on many files needed.
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.