view tests/test-simplemerge.py.out @ 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 f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK