3 ms·Conflict: A small esoteric language giving semantics to Git merge conflict1 points by andybak 5y ago