mercutiodesign/merge-conflict-py

Merge conflict example for Git workshop

Python