diff tests/test-rebase-conflicts.t @ 24626:e767f5aba810

histedit: fix preventing strips during histedit We were trying to prevent strips of important nodes during histedit, but the check was actually comparing the short hashes in the rules to the exact value the user typed in, so it only ever worked if the user typed a 12 character hash.
author Durham Goode <durham@fb.com>
date Sat, 04 Apr 2015 11:24:48 -0700
parents 9347c15d8136
children bd625cd4e5e7 af5b2f4ed594
line wrap: on
line diff