git p4: Squash P4EDITOR in test harness