comparison mercurial/merge.py @ 35319:228916ca12b5

rebase: add concludememorynode(), and call it when rebasing in-memory Differential Revision: https://phab.mercurial-scm.org/D1248
author Phil Cohen <phillco@fb.com>
date Thu, 07 Dec 2017 22:35:43 -0800
parents 5db3c748ce8f
children 87918218da70
comparison
equal deleted inserted replaced
35318:2bac2d836ce0 35319:228916ca12b5