diff setup.py @ 27134:cb5bdf65420f

debugmergestate: print out null nodes as 'null' This is so much easier to read than a long string of zeroes, and we're going to have a lot more of these nodes once change/delete conflicts are part of the merge state.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 10:26:37 -0800
parents 7309853eedae
children 4374d819ccd5
line wrap: on
line diff