Mercurial > hg
diff contrib/editmerge @ 31204:84e8a6834223
filemerge: tag merge tool for blocked times
Merge tools can take a while - let's ensure that they're appropriately tagged
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Mon, 06 Mar 2017 03:19:40 -0800 |
parents | 612502900a2d |
children |