comparison mercurial/namespaces.py @ 26997:1791f9aa782f

test-resolve.t: switch to mergestate.read() See previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 15:43:21 -0800
parents c0c89b2d07be
children ca52512ac709
comparison
equal deleted inserted replaced
26996:bf3eec62212f 26997:1791f9aa782f