Conflict: A small esoteric language giving semantics to Git merge conflictgithub.com/basile-henry1 pointandybak5 years ago