diff mercurial/hgweb/hgweb_mod.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 da5d5ea7d696
children ef3a24a023ec 742ce6fbc109
line wrap: on
line diff