I miss some of the capabilities from p4merge such as the split diff having a margin inbetween showing which parts of the file correspond to the other file, whil

I miss some of the capabilities from p4merge such as the split diff having a margin inbetween showing which parts of the file correspond to the other file, whilst also showing the impact of the diff on both sides: https://www.perforce.com/manuals/p4merge/Content/P4Merge/diff-merge.text_diff.html#Diffing_text_files https://www.perforce.com/manuals/p4merge/Content/P4Merge/dif... I also like their 3-way merge capability https://www.perforce.com/manuals/p4merge/Content/P4Merge/diff-merge.p4merge.html#Navigate_diffs https://www.perforce.com/manuals/p4merge/Content/P4Merge/dif... these features never made it into the web based diff tools that are widespread, I think the 3 way diff is a be a good way to show result of a difficult merge