diff mercurial/hgweb/webutil.py @ 27136:29b08ca680b0

test-merge-changedelete.t: print out debugmergestate We're going to use this to verify the merge state in upcoming patches.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:26:46 -0800
parents 37fcfe52c68c
children 5aa2afb4f81a
line wrap: on
line diff