# HG changeset patch # User Pierre-Yves David # Date 1615543996 -3600 # Node ID 6798147f6e58ea671add0b3192b61c36094048e7 # Parent ce765eb3cfd286df900b2669cadb60376d3a6ee4# Parent 7dfb3b2670705cccd5303ac27d54b7518be591f0 branching: merge with the wrong head (keep the change from the right branch only)