comparison mercurial/hgweb/hgwebdir_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 d1fccbd50fcd
children c6061cadb400 ff2370a70fe8
comparison
equal deleted inserted replaced
35319:228916ca12b5 35320:d901a88891fe