Mercurial > hg
diff hgweb.cgi @ 27036:63d6bc874dea
filemerge: add support for change/delete conflicts to the ':local' merge tool
This covers two of the four cases of change/delete conflicts -- in an upcoming
patch we'll make :other cover the other two.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 15:40:28 -0800 |
parents | 4b0fc75f9403 |
children | 47ef023d0165 |