comparison setup.py @ 26993:d240ae897ba6

commands.resolve: switch to mergestate.read() See previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 13:56:46 -0800
parents e8497889edab
children 7309853eedae
comparison
equal deleted inserted replaced
26992:b3b5ed560283 26993:d240ae897ba6