comparison contrib/editmerge @ 37038:7db86856f27f

rebase: pass in "keepbranch" to conclude[memory]node() Both functions calculated the same "keepbranch" value from the "keepbranches" we passed in, so let's make the caller do it instead. Differential Revision: https://phab.mercurial-scm.org/D2919
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 20 Mar 2018 21:49:09 -0700
parents 612502900a2d
children
comparison
equal deleted inserted replaced
37037:bd0086bd3af4 37038:7db86856f27f