diff mercurial/httppeer.py @ 35320:d901a88891fe

rebase: rerun a rebase on-disk if IMM merge conflicts arise Differential Revision: https://phab.mercurial-scm.org/D1249
author Phil Cohen <phillco@fb.com>
date Fri, 08 Dec 2017 12:14:38 -0800
parents bfd072c52e03
children 98bc4c43f570
line wrap: on
line diff