Mercurial > hg
comparison contrib/logo-droplets.svg @ 27161:296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Just like binary and symlink conflicts, change/delete conflicts influence the
tool picked.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 25 Nov 2015 14:25:26 -0800 |
| parents | 6514935e223d |
| children | d4ba4d51f85f |
comparison
equal
deleted
inserted
replaced
| 27160:c533435cbc37 | 27161:296d55def9c4 |
|---|