comparison contrib/check-config.py @ 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 d1cb185b9ee2
children 9c98fe1416c2
comparison
equal deleted inserted replaced
26764:7ce6fd705495 26765:45976219eb80