comparison tests/test-pull-branch.t @ 18512:22978b82ab4b stable

rebase: remove bogus nullmerge check in updatebookmarks nstate[v] is a node, not an int, and the nullmerge check was done while building nstate anyway.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Jan 2013 17:49:54 -0800
parents 4f8054d3171b
children 701df761aa94
comparison
equal deleted inserted replaced
18511:798ab869b2ee 18512:22978b82ab4b