comparison tests/test-histedit-fold-non-commute.t @ 27077:ca3fbf9dad8c

mergestate: add a function to return the number of unresolved files Note that unlike the other functions, this is based on the persistent mergestate.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 16:18:51 -0800
parents ef1eb6df7071
children 5837ca674da9
comparison
equal deleted inserted replaced
27076:09139ccf3085 27077:ca3fbf9dad8c