comparison mercurial/merge.py @ 27207:2d8dbeb2462c

histedit: change state.rules uses to state.actions This change is replacing most of state.rules uses with state.actions uses. The next change will change histeditstate class to actually uses state actions.
author Mateusz Kwapich <mitrandir@fb.com>
date Wed, 02 Dec 2015 12:19:01 -0800
parents 25e4b2f000c5
children d6859d86a5d5
comparison
equal deleted inserted replaced
27206:7a523b6d5265 27207:2d8dbeb2462c