Mercurial > hg
comparison tests/test-merge-commit.t @ 26606:2a405d307f8c
filemerge: also return whether the merge is complete
In future patches, we'll pause merges after the premerge step. After the
premerge step we'll return complete = False.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 12:56:21 -0700 |
| parents | d8463a743d7d |
| children | 8e6d5b7317e6 |
comparison
equal
deleted
inserted
replaced
| 26605:ef21a2c41629 | 26606:2a405d307f8c |
|---|