Mercurial > hg
comparison tests/test-diff-binary-file.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 | 0db6810e84e8 |
| children | 186f2afe9919 |
comparison
equal
deleted
inserted
replaced
| 27074:78b0c88ab0db | 27075:6373330155b2 |
|---|