Mercurial > hg
diff tests/test-merge-symlinks.t @ 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 | f2719b387380 |
children | b6776b34e44e |