comparison tests/test-merge-types.t @ 35317:5c25fe7fb1e6

rebase: do not update if IMM; instead, set the overlaywctx's parents Differential Revision: https://phab.mercurial-scm.org/D1246
author Phil Cohen <phillco@fb.com>
date Thu, 07 Dec 2017 16:07:06 -0800
parents 1b5c61d38a52
children 41ef02ba329b
comparison
equal deleted inserted replaced
35316:259feddc04e6 35317:5c25fe7fb1e6