Mercurial > hg
view tests/test-filelog.py.out @ 27075:6373330155b2
mergestate._resolve: don't return the action any more
This is a partial backout of an earlier diff -- now that we're storing the
results in a dict, we don't actually need this any more.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 20 Nov 2015 16:32:47 -0800 |
parents | d76ba2090e0c |
children |
line wrap: on
line source
ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n OK.