dear sweet FSM I am sick of doing no-op DVCS merges. DVCS "reduce" the merge pain by making you do it NON STOP.