diff mercurial/templatefilters.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 4fdc4adbc838
children dad8a5071b0a d1aae6d4efc5
line wrap: on
line diff