Mercurial > hg
diff tests/test-share.t @ 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 | 8c14f87bd0ae |
children | 0332b8fafd05 |