diff hgext/keyword.py @ 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 9fcea3f47a3a
children f0564402d059
line wrap: on
line diff