Creating merge conflicts to test vim diff