Mercurial > public > mercurial-scm > hg
comparison mercurial/unionrepo.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 | 21fc747e1bc5 |
children | 1541e1a8e87d |
comparison
equal
deleted
inserted
replaced
35319:228916ca12b5 | 35320:d901a88891fe |
---|