Mercurial > hg
diff mercurial/copies.py @ 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 | 4b9bb1616195 |
children | f3c6540f2cd1 |