Reviewing @Tsyesika's federation code, and feeling really grateful for magit's ediff integration.