Mercurial > hg
comparison mercurial/httpclient/socketutil.py @ 27033:089dab8794dc
filemerge: return whether the file is deleted from all other merge tools
This is required for change/delete conflicts -- see the previous patch for more
information.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 18 Nov 2015 13:55:31 -0800 |
| parents | 328739ea70c3 |
| children | 1ad9da968a2e |
comparison
equal
deleted
inserted
replaced
| 27032:28ee7af4b685 | 27033:089dab8794dc |
|---|