annotate mercurial/thirdparty/__init__.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 765eb17a7eb8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source