diff mercurial/templates/gitweb/changeset.tmpl @ 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 e9a8a941950a
children 1721ce06100a
line wrap: on
line diff