Mercurial > hg
comparison mercurial/worker.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 | 56b2bcea2529 |
children | f8efc8a3a991 |
comparison
equal
deleted
inserted
replaced
27032:28ee7af4b685 | 27033:089dab8794dc |
---|