Archived tweet #4110 from the @leastfixedpoint Twitter Archive

@bascule 3-way merge is too dumb to know that A+B should be chosen over A alone, B alone, or some C. raw.github.com/tonyg/revctrl.…