comparison Makefile @ 27005:3185c01c551c

mergestate: move _read() call to read constructor With this patch, mergestate.clean() will no longer abort when it encounters an unsupported merge type. However we hold off on testing it until backwards compatibility is in place.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 14:04:56 -0800
parents c5c7c686d6a6
children 7fbab10f812f
comparison
equal deleted inserted replaced
27004:a4c26918fb23 27005:3185c01c551c