diff Makefile @ 26765:45976219eb80

merge.mergestate: add a way to get the other side of the merge It's surprising there was no API at all for this until now. In any case this will be needed from custom merge drivers.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 00:49:07 -0700
parents c5c7c686d6a6
children 7fbab10f812f
line wrap: on
line diff