Mercurial > hg
diff mercurial/exchange.py @ 27034:86ede9eda252
filemerge: return whether the file was deleted
This is required for change/delete conflict resolution -- see previous patches
for more details.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 14:22:52 -0800 |
parents | c4a7bbc78c74 |
children | 709977a4fc9d |