Ticket #2863 (mcdiff bidirectional merge enhancement)