diff hgext/drophack.py @ 1183:58370c718183 stable

evolve: use `merge.graft` instead of `rebasenode` The core mechanism is properly factorised and have a more stable API. This is also a good step toward removing the dependency between evolve and the rebase extension. This also avoid a breakage with the future 3.3 where some of the rebase API changed.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 13 Dec 2014 17:47:09 -0800
parents 1a39b1b8e092
children 1f8428096078
line wrap: on
line diff