diff tests/test-diff-binary-file.t @ 24767:477e76936b1d

histedit: convert pick action into a class This converts the pick action into a histeditclass instance, as part of an ongoing effort to refactor histedit for maintainability and robustness. The test output changed because previously pick would only report the commit disappearing if there were no merge conflicts. Now that we've unified the normal and the --continue flows, they act the same and we get the warning even after --continue.
author Durham Goode <durham@fb.com>
date Sat, 04 Apr 2015 11:39:08 -0700
parents 0db6810e84e8
children 186f2afe9919
line wrap: on
line diff