diff tests/test-rebase-conflicts.t @ 32420:0906b85bf222

demandimport: move to separate package In Python 3, demand loading is per-package. Keeping demandimport in the mercurial package would disable demand loading for any modules in mercurial.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 21 May 2017 12:10:53 -0700
parents 24f55686a63d
children 8e3021fd1a44
line wrap: on
line diff