comparison contrib/bash_completion @ 28010:eb22def9db3b

merge: add debugmergestate support for _stateextras Now that we can store extras for each file, we need to have support for showing it in debugmergestate (the tests depend on this).
author Durham Goode <durham@fb.com>
date Fri, 05 Feb 2016 10:15:28 -0800
parents 8aacac09e222
children 63fad6235369
comparison
equal deleted inserted replaced
28009:4a25e91fa55d 28010:eb22def9db3b