hdiff
packages
feed
intricacy
-0.9.0.0: tutorial/11-conflicts.text
forces conflict if pieces would collide or be pushed in two directions