I am doing some git merging and there is a conflict.
Usually the conflicts are small (less than 10 lines) but this has lots of conflicts that are more than 10 lines each.
What software would you recommend to view the conflict side by side?
Can I use
Currently I just open the file with conflicts in vim and manually edit.